-rw-r--r-- | kabc/addressee.cpp | 17 | ||||
-rw-r--r-- | kabc/addressee.h | 3 | ||||
-rw-r--r-- | kabc/field.cpp | 6 | ||||
-rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 2 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 26 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 13 |
6 files changed, 31 insertions, 36 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 7f592e9..155ce24 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -53,3 +53,2 @@ struct Addressee::AddresseeData : public KShared | |||
53 | QString formattedName; | 53 | QString formattedName; |
54 | QString defaultFormattedName; | ||
55 | QString familyName; | 54 | QString familyName; |
@@ -750,9 +749,2 @@ void Addressee::setFormattedName( const QString &formattedName ) | |||
750 | } | 749 | } |
751 | void Addressee::setDefaultFormattedName( const QString &formattedName ) | ||
752 | { | ||
753 | if ( formattedName == mData->defaultFormattedName ) return; | ||
754 | detach(); | ||
755 | mData->empty = false; | ||
756 | mData->defaultFormattedName = formattedName; | ||
757 | } | ||
758 | 750 | ||
@@ -762,6 +754,2 @@ QString Addressee::formattedName() const | |||
762 | } | 754 | } |
763 | QString Addressee::defaultFormattedName() const | ||
764 | { | ||
765 | return mData->defaultFormattedName; | ||
766 | } | ||
767 | 755 | ||
@@ -772,7 +760,2 @@ QString Addressee::formattedNameLabel() | |||
772 | 760 | ||
773 | QString Addressee::defaultFormattedNameLabel() | ||
774 | { | ||
775 | return i18n("Def.Formatted Name"); | ||
776 | } | ||
777 | |||
778 | 761 | ||
diff --git a/kabc/addressee.h b/kabc/addressee.h index 0d688f8..a2fbcf5 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -156,3 +156,2 @@ class Addressee | |||
156 | void setFormattedName( const QString &formattedName ); | 156 | void setFormattedName( const QString &formattedName ); |
157 | void setDefaultFormattedName( const QString &formattedName ); | ||
158 | /** | 157 | /** |
@@ -161,3 +160,2 @@ class Addressee | |||
161 | QString formattedName() const; | 160 | QString formattedName() const; |
162 | QString defaultFormattedName() const; | ||
163 | /** | 161 | /** |
@@ -166,3 +164,2 @@ class Addressee | |||
166 | static QString formattedNameLabel(); | 164 | static QString formattedNameLabel(); |
167 | static QString defaultFormattedNameLabel(); | ||
168 | 165 | ||
diff --git a/kabc/field.cpp b/kabc/field.cpp index 5c561c3..fd51026 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -89,3 +89,2 @@ class Field::FieldImpl | |||
89 | Sip, | 89 | Sip, |
90 | DefaultFormattedName, | ||
91 | MobileWorkPhone, | 90 | MobileWorkPhone, |
@@ -131,4 +130,2 @@ QString Field::label() | |||
131 | return Addressee::formattedNameLabel(); | 130 | return Addressee::formattedNameLabel(); |
132 | case FieldImpl::DefaultFormattedName: | ||
133 | return Addressee::defaultFormattedNameLabel(); | ||
134 | case FieldImpl::FamilyName: | 131 | case FieldImpl::FamilyName: |
@@ -250,4 +247,2 @@ QString Field::value( const KABC::Addressee &a ) | |||
250 | return a.formattedName(); | 247 | return a.formattedName(); |
251 | case FieldImpl::DefaultFormattedName: | ||
252 | return a.defaultFormattedName(); | ||
253 | case FieldImpl::FamilyName: | 248 | case FieldImpl::FamilyName: |
@@ -410,3 +405,2 @@ Field::List Field::allFields() | |||
410 | createField( FieldImpl::FormattedName, Frequent ); | 405 | createField( FieldImpl::FormattedName, Frequent ); |
411 | createField( FieldImpl::DefaultFormattedName, Frequent ); | ||
412 | createField( FieldImpl::FamilyName, Frequent ); | 406 | createField( FieldImpl::FamilyName, Frequent ); |
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index b3da428..294ce7d 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp | |||
@@ -58,3 +58,3 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) | |||
58 | mPopUp->insertSeparator(); | 58 | mPopUp->insertSeparator(); |
59 | mPopUp->insertItem( "What's Todo?", this, SLOT ( showTodo() ) ); | 59 | mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) ); |
60 | mPopUp->insertSeparator(); | 60 | mPopUp->insertSeparator(); |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 23afe7a..e545ca8 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -445,4 +445,7 @@ QPixmap * KOAgendaItem::paintPix() | |||
445 | static QPixmap* mPaintPix = 0; | 445 | static QPixmap* mPaintPix = 0; |
446 | if ( ! mPaintPix ) | 446 | if ( ! mPaintPix ) { |
447 | mPaintPix = new QPixmap(1,1); | 447 | int w = QApplication::desktop()->width(); |
448 | int h = QApplication::desktop()->height(); | ||
449 | mPaintPix = new QPixmap(w,h); | ||
450 | } | ||
448 | return mPaintPix ; | 451 | return mPaintPix ; |
@@ -452,4 +455,7 @@ QPixmap * KOAgendaItem::paintPixAllday() | |||
452 | static QPixmap* mPaintPixA = 0; | 455 | static QPixmap* mPaintPixA = 0; |
453 | if ( ! mPaintPixA ) | 456 | if ( ! mPaintPixA ) { |
454 | mPaintPixA = new QPixmap(1,1); | 457 | int w = QApplication::desktop()->width(); |
458 | int h = QApplication::desktop()->height()/3; | ||
459 | mPaintPixA = new QPixmap(w,h); | ||
460 | } | ||
455 | return mPaintPixA ; | 461 | return mPaintPixA ; |
@@ -459,4 +465,7 @@ QPixmap * KOAgendaItem::paintPixSel() | |||
459 | static QPixmap* mPaintPixSel = 0; | 465 | static QPixmap* mPaintPixSel = 0; |
460 | if ( ! mPaintPixSel ) | 466 | if ( ! mPaintPixSel ) { |
461 | mPaintPixSel = new QPixmap(1,1); | 467 | int w = QApplication::desktop()->width(); |
468 | int h = QApplication::desktop()->height(); | ||
469 | mPaintPixSel = new QPixmap(w,h); | ||
470 | } | ||
462 | return mPaintPixSel ; | 471 | return mPaintPixSel ; |
@@ -527,3 +536,2 @@ void KOAgendaItem::computeText() | |||
527 | { | 536 | { |
528 | |||
529 | mDisplayedText = mIncidence->summary(); | 537 | mDisplayedText = mIncidence->summary(); |
@@ -555,3 +563,3 @@ void KOAgendaItem::computeText() | |||
555 | } | 563 | } |
556 | 564 | #ifdef DESKTOP_VERSION | |
557 | QString tipText = mIncidence->summary(); | 565 | QString tipText = mIncidence->summary(); |
@@ -585,3 +593,3 @@ void KOAgendaItem::computeText() | |||
585 | QToolTip::add(this,tipText,toolTipGroup(),""); | 593 | QToolTip::add(this,tipText,toolTipGroup(),""); |
586 | 594 | #endif | |
587 | } | 595 | } |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 4dfb9df..65d6acf 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -643,2 +643,6 @@ int MonthViewCell::insertEvent(Event *event) | |||
643 | { | 643 | { |
644 | bool useToolTips = true; | ||
645 | #ifndef DEKSTOP_VERSION | ||
646 | useToolTips = false; | ||
647 | #endif | ||
644 | QString mToolTipText; | 648 | QString mToolTipText; |
@@ -689,2 +693,3 @@ int MonthViewCell::insertEvent(Event *event) | |||
689 | text = time + event->summary(); | 693 | text = time + event->summary(); |
694 | if ( useToolTips ) | ||
690 | mToolTipText += prefix + text; | 695 | mToolTipText += prefix + text; |
@@ -693,2 +698,3 @@ int MonthViewCell::insertEvent(Event *event) | |||
693 | text = event->summary(); | 698 | text = event->summary(); |
699 | if ( useToolTips ) | ||
694 | mToolTipText += text; | 700 | mToolTipText += text; |
@@ -698,2 +704,3 @@ int MonthViewCell::insertEvent(Event *event) | |||
698 | text += " " + event->summary(); | 704 | text += " " + event->summary(); |
705 | if ( useToolTips ) | ||
699 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 706 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
@@ -701,2 +708,5 @@ int MonthViewCell::insertEvent(Event *event) | |||
701 | } | 708 | } |
709 | if ( useToolTips && ! event->location().isEmpty() ) { | ||
710 | mToolTipText += " (" + event->location() +")"; | ||
711 | } | ||
702 | MonthViewItem *item ; | 712 | MonthViewItem *item ; |
@@ -766,2 +776,3 @@ int MonthViewCell::insertEvent(Event *event) | |||
766 | } | 776 | } |
777 | if ( useToolTips ) | ||
767 | mToolTip.append( mToolTipText ); | 778 | mToolTip.append( mToolTipText ); |
@@ -818,3 +829,5 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
818 | insertItem( item , count()); | 829 | insertItem( item , count()); |
830 | #ifdef DESKTOP_VERSION | ||
819 | mToolTip.append( text ); | 831 | mToolTip.append( text ); |
832 | #endif | ||
820 | } | 833 | } |