author | zautrix <zautrix> | 2005-04-08 10:54:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-08 10:54:05 (UTC) |
commit | 59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef (patch) (unidiff) | |
tree | ab604082029c081fa8725c5535a51a23bb963ef2 | |
parent | c82f9b40f6023dc7b39ac555cba8c4c313f15ca8 (diff) | |
download | kdepimpi-59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef.zip kdepimpi-59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef.tar.gz kdepimpi-59fb8a0ac35bf3b81f1c4e2e4fc6b61356d064ef.tar.bz2 |
fixes
-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 | 28 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 21 |
6 files changed, 36 insertions, 41 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 7f592e9..155ce24 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -52,5 +52,4 @@ struct Addressee::AddresseeData : public KShared | |||
52 | QString name; | 52 | QString name; |
53 | QString formattedName; | 53 | QString formattedName; |
54 | QString defaultFormattedName; | ||
55 | QString familyName; | 54 | QString familyName; |
56 | QString givenName; | 55 | QString givenName; |
@@ -749,11 +748,4 @@ void Addressee::setFormattedName( const QString &formattedName ) | |||
749 | mData->formattedName = formattedName; | 748 | mData->formattedName = 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 | ||
759 | QString Addressee::formattedName() const | 751 | QString Addressee::formattedName() const |
@@ -761,8 +753,4 @@ QString Addressee::formattedName() const | |||
761 | return mData->formattedName; | 753 | return mData->formattedName; |
762 | } | 754 | } |
763 | QString Addressee::defaultFormattedName() const | ||
764 | { | ||
765 | return mData->defaultFormattedName; | ||
766 | } | ||
767 | 755 | ||
768 | QString Addressee::formattedNameLabel() | 756 | QString Addressee::formattedNameLabel() |
@@ -771,9 +759,4 @@ QString Addressee::formattedNameLabel() | |||
771 | } | 759 | } |
772 | 760 | ||
773 | QString Addressee::defaultFormattedNameLabel() | ||
774 | { | ||
775 | return i18n("Def.Formatted Name"); | ||
776 | } | ||
777 | |||
778 | 761 | ||
779 | void Addressee::setFamilyName( const QString &familyName ) | 762 | void Addressee::setFamilyName( const QString &familyName ) |
diff --git a/kabc/addressee.h b/kabc/addressee.h index 0d688f8..a2fbcf5 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -155,15 +155,12 @@ class Addressee | |||
155 | */ | 155 | */ |
156 | void setFormattedName( const QString &formattedName ); | 156 | void setFormattedName( const QString &formattedName ); |
157 | void setDefaultFormattedName( const QString &formattedName ); | ||
158 | /** | 157 | /** |
159 | Return formatted name. | 158 | Return formatted name. |
160 | */ | 159 | */ |
161 | QString formattedName() const; | 160 | QString formattedName() const; |
162 | QString defaultFormattedName() const; | ||
163 | /** | 161 | /** |
164 | Return translated label for formattedName field. | 162 | Return translated label for formattedName field. |
165 | */ | 163 | */ |
166 | static QString formattedNameLabel(); | 164 | static QString formattedNameLabel(); |
167 | static QString defaultFormattedNameLabel(); | ||
168 | 165 | ||
169 | /** | 166 | /** |
diff --git a/kabc/field.cpp b/kabc/field.cpp index 5c561c3..fd51026 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -88,5 +88,4 @@ class Field::FieldImpl | |||
88 | Resource, | 88 | Resource, |
89 | Sip, | 89 | Sip, |
90 | DefaultFormattedName, | ||
91 | MobileWorkPhone, | 90 | MobileWorkPhone, |
92 | MobileHomePhone | 91 | MobileHomePhone |
@@ -130,6 +129,4 @@ QString Field::label() | |||
130 | case FieldImpl::FormattedName: | 129 | case FieldImpl::FormattedName: |
131 | return Addressee::formattedNameLabel(); | 130 | return Addressee::formattedNameLabel(); |
132 | case FieldImpl::DefaultFormattedName: | ||
133 | return Addressee::defaultFormattedNameLabel(); | ||
134 | case FieldImpl::FamilyName: | 131 | case FieldImpl::FamilyName: |
135 | return Addressee::familyNameLabel(); | 132 | return Addressee::familyNameLabel(); |
@@ -249,6 +246,4 @@ QString Field::value( const KABC::Addressee &a ) | |||
249 | case FieldImpl::FormattedName: | 246 | case FieldImpl::FormattedName: |
250 | return a.formattedName(); | 247 | return a.formattedName(); |
251 | case FieldImpl::DefaultFormattedName: | ||
252 | return a.defaultFormattedName(); | ||
253 | case FieldImpl::FamilyName: | 248 | case FieldImpl::FamilyName: |
254 | return a.familyName(); | 249 | return a.familyName(); |
@@ -409,5 +404,4 @@ Field::List Field::allFields() | |||
409 | if ( mAllFields.isEmpty() ) { | 404 | if ( mAllFields.isEmpty() ) { |
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 ); |
413 | createField( FieldImpl::GivenName, Frequent ); | 407 | createField( FieldImpl::GivenName, Frequent ); |
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index b3da428..294ce7d 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp | |||
@@ -57,5 +57,5 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent ) | |||
57 | mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) ); | 57 | mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) ); |
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(); |
61 | mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) ); | 61 | mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) ); |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 23afe7a..e545ca8 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -444,6 +444,9 @@ QPixmap * KOAgendaItem::paintPix() | |||
444 | { | 444 | { |
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 ; |
449 | } | 452 | } |
@@ -451,6 +454,9 @@ QPixmap * KOAgendaItem::paintPixAllday() | |||
451 | { | 454 | { |
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 ; |
456 | } | 462 | } |
@@ -458,6 +464,9 @@ QPixmap * KOAgendaItem::paintPixSel() | |||
458 | { | 464 | { |
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 ; |
463 | } | 472 | } |
@@ -526,5 +535,4 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) | |||
526 | void KOAgendaItem::computeText() | 535 | void KOAgendaItem::computeText() |
527 | { | 536 | { |
528 | |||
529 | mDisplayedText = mIncidence->summary(); | 537 | mDisplayedText = mIncidence->summary(); |
530 | if ( (mIncidence->type() == "Todo") ) { | 538 | if ( (mIncidence->type() == "Todo") ) { |
@@ -537,5 +545,5 @@ void KOAgendaItem::computeText() | |||
537 | } else { | 545 | } else { |
538 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) | 546 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) |
539 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; | 547 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; |
540 | 548 | ||
541 | if ( mAllDay ) { | 549 | if ( mAllDay ) { |
@@ -554,5 +562,5 @@ void KOAgendaItem::computeText() | |||
554 | mDisplayedText += mIncidence->location() +")"; | 562 | mDisplayedText += mIncidence->location() +")"; |
555 | } | 563 | } |
556 | 564 | #ifdef DESKTOP_VERSION | |
557 | QString tipText = mIncidence->summary(); | 565 | QString tipText = mIncidence->summary(); |
558 | if ( !mIncidence->doesFloat() ) { | 566 | if ( !mIncidence->doesFloat() ) { |
@@ -584,5 +592,5 @@ void KOAgendaItem::computeText() | |||
584 | } | 592 | } |
585 | QToolTip::add(this,tipText,toolTipGroup(),""); | 593 | QToolTip::add(this,tipText,toolTipGroup(),""); |
586 | 594 | #endif | |
587 | } | 595 | } |
588 | void KOAgendaItem::updateItem() | 596 | void KOAgendaItem::updateItem() |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 4dfb9df..65d6acf 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -642,4 +642,8 @@ void MonthViewCell::startUpdateCell() | |||
642 | int MonthViewCell::insertEvent(Event *event) | 642 | 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; |
645 | setFocusPolicy(WheelFocus); | 649 | setFocusPolicy(WheelFocus); |
@@ -688,16 +692,22 @@ int MonthViewCell::insertEvent(Event *event) | |||
688 | } | 692 | } |
689 | text = time + event->summary(); | 693 | text = time + event->summary(); |
690 | mToolTipText += prefix + text; | 694 | if ( useToolTips ) |
695 | mToolTipText += prefix + text; | ||
691 | } else { | 696 | } else { |
692 | if (event->doesFloat()) { | 697 | if (event->doesFloat()) { |
693 | text = event->summary(); | 698 | text = event->summary(); |
694 | mToolTipText += text; | 699 | if ( useToolTips ) |
700 | mToolTipText += text; | ||
695 | } | 701 | } |
696 | else { | 702 | else { |
697 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 703 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
698 | text += " " + event->summary(); | 704 | text += " " + event->summary(); |
699 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 705 | if ( useToolTips ) |
706 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | ||
700 | } | 707 | } |
701 | } | 708 | } |
709 | if ( useToolTips && ! event->location().isEmpty() ) { | ||
710 | mToolTipText += " (" + event->location() +")"; | ||
711 | } | ||
702 | MonthViewItem *item ; | 712 | MonthViewItem *item ; |
703 | 713 | ||
@@ -765,5 +775,6 @@ int MonthViewCell::insertEvent(Event *event) | |||
765 | insertItem( item ,pos); | 775 | insertItem( item ,pos); |
766 | } | 776 | } |
767 | mToolTip.append( mToolTipText ); | 777 | if ( useToolTips ) |
778 | mToolTip.append( mToolTipText ); | ||
768 | return mdayCount; | 779 | return mdayCount; |
769 | } | 780 | } |
@@ -817,5 +828,7 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
817 | item->setMoreInfo( todo->description().length() > 0 ); | 828 | item->setMoreInfo( todo->description().length() > 0 ); |
818 | insertItem( item , count()); | 829 | insertItem( item , count()); |
830 | #ifdef DESKTOP_VERSION | ||
819 | mToolTip.append( text ); | 831 | mToolTip.append( text ); |
832 | #endif | ||
820 | } | 833 | } |
821 | void MonthViewCell::repaintfinishUpdateCell() | 834 | void MonthViewCell::repaintfinishUpdateCell() |