author | zautrix <zautrix> | 2005-03-15 11:29:40 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-15 11:29:40 (UTC) |
commit | 79b580aacaa1626ccb8c2657796051bf79701e2d (patch) (unidiff) | |
tree | 3c2d7d61a945e5abb77eb542b943d8b1d5c0d029 /korganizer | |
parent | 6b748e1b7b4213871a5866a9af50e99800d2a704 (diff) | |
download | kdepimpi-79b580aacaa1626ccb8c2657796051bf79701e2d.zip kdepimpi-79b580aacaa1626ccb8c2657796051bf79701e2d.tar.gz kdepimpi-79b580aacaa1626ccb8c2657796051bf79701e2d.tar.bz2 |
monthview tooltip sort fixed
-rw-r--r-- | korganizer/komonthview.cpp | 24 | ||||
-rw-r--r-- | korganizer/komonthview.h | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 4bf9dea..004ff50 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -492,20 +492,20 @@ void MonthViewCell::startUpdateCell() | |||
492 | 492 | ||
493 | #ifdef DESKTOP_VERSION | 493 | #ifdef DESKTOP_VERSION |
494 | QToolTip::remove(this); | 494 | QToolTip::remove(this); |
495 | #endif | 495 | #endif |
496 | mToolTip = ""; | 496 | mToolTip.clear(); |
497 | //qApp->processEvents(); | 497 | //qApp->processEvents(); |
498 | if ( !mHolidayString.isEmpty() ) { | 498 | if ( !mHolidayString.isEmpty() ) { |
499 | MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); | 499 | MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); |
500 | item->setPalette( mHolidayPalette ); | 500 | item->setPalette( mHolidayPalette ); |
501 | mItemList->insertItem( item ); | 501 | mItemList->insertItem( item ); |
502 | mToolTip += mHolidayString+"\n"; | 502 | mToolTip.append ( mHolidayString ); |
503 | } | 503 | } |
504 | } | 504 | } |
505 | 505 | ||
506 | void MonthViewCell::insertEvent(Event *event) | 506 | void MonthViewCell::insertEvent(Event *event) |
507 | { | 507 | { |
508 | 508 | QString mToolTipText; | |
509 | mItemList->setFocusPolicy(WheelFocus); | 509 | mItemList->setFocusPolicy(WheelFocus); |
510 | if ( !(event->doesRecur() == Recurrence::rNone) ) { | 510 | if ( !(event->doesRecur() == Recurrence::rNone) ) { |
511 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) | 511 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) |
@@ -552,16 +552,16 @@ void MonthViewCell::insertEvent(Event *event) | |||
552 | 552 | ||
553 | } | 553 | } |
554 | text = time + event->summary(); | 554 | text = time + event->summary(); |
555 | mToolTip += prefix + text; | 555 | mToolTipText += prefix + text; |
556 | } else { | 556 | } else { |
557 | if (event->doesFloat()) { | 557 | if (event->doesFloat()) { |
558 | text = event->summary(); | 558 | text = event->summary(); |
559 | mToolTip += text; | 559 | mToolTipText += text; |
560 | } | 560 | } |
561 | else { | 561 | else { |
562 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 562 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
563 | text += " " + event->summary(); | 563 | text += " " + event->summary(); |
564 | mToolTip += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 564 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
565 | } | 565 | } |
566 | } | 566 | } |
567 | 567 | ||
@@ -606,7 +606,7 @@ void MonthViewCell::insertEvent(Event *event) | |||
606 | #endif | 606 | #endif |
607 | item->setMultiDay( multiday ); | 607 | item->setMultiDay( multiday ); |
608 | mItemList->insertItem( item ); | 608 | mItemList->insertItem( item ); |
609 | mToolTip += "\n"; | 609 | mToolTip.append( mToolTipText ); |
610 | } | 610 | } |
611 | void MonthViewCell::insertTodo(Todo *todo) | 611 | void MonthViewCell::insertTodo(Todo *todo) |
612 | { | 612 | { |
@@ -650,13 +650,15 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
650 | item->setAlarm( todo->isAlarmEnabled() ); | 650 | item->setAlarm( todo->isAlarmEnabled() ); |
651 | item->setMoreInfo( todo->description().length() > 0 ); | 651 | item->setMoreInfo( todo->description().length() > 0 ); |
652 | mItemList->insertItem( item ); | 652 | mItemList->insertItem( item ); |
653 | mToolTip += text+"\n"; | 653 | mToolTip.append( text ); |
654 | } | 654 | } |
655 | void MonthViewCell::finishUpdateCell() | 655 | void MonthViewCell::finishUpdateCell() |
656 | { | 656 | { |
657 | #ifdef DESKTOP_VERSION | 657 | #ifdef DESKTOP_VERSION |
658 | if (mToolTip != "") | 658 | if (mToolTip.count() > 0 ) { |
659 | QToolTip::add(this,mToolTip,toolTipGroup(),""); | 659 | mToolTip.sort(); |
660 | QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); | ||
661 | } | ||
660 | #endif | 662 | #endif |
661 | mItemList->sort(); | 663 | mItemList->sort(); |
662 | //setMyPalette(); | 664 | //setMyPalette(); |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index fd8cbf2..a92421b 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -167,7 +167,7 @@ class MonthViewCell : public QWidget | |||
167 | void showDaySignal( QDate ); | 167 | void showDaySignal( QDate ); |
168 | 168 | ||
169 | protected: | 169 | protected: |
170 | QString mToolTip; | 170 | QStringList mToolTip; |
171 | void resizeEvent( QResizeEvent * ); | 171 | void resizeEvent( QResizeEvent * ); |
172 | 172 | ||
173 | 173 | ||