-rw-r--r-- | korganizer/komonthview.cpp | 40 | ||||
-rw-r--r-- | korganizer/komonthview.h | 11 |
2 files changed, 45 insertions, 6 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 08232e2..9344567 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -55,5 +55,7 @@ | |||
55 | 55 | ||
56 | #define PIXMAP_SIZE 5 | 56 | #define PIXMAP_SIZE 5 |
57 | 57 | #ifdef DESKTOP_VERSION | |
58 | QToolTipGroup *MonthViewCell::mToolTipGroup = 0; | ||
59 | #endif | ||
58 | class KNOWhatsThis :public QWhatsThis | 60 | class KNOWhatsThis :public QWhatsThis |
59 | { | 61 | { |
@@ -85,5 +87,5 @@ QString KNoScrollListBox::getWhatsThisText(QPoint p) | |||
85 | QListBoxItem* item = itemAt ( p ); | 87 | QListBoxItem* item = itemAt ( p ); |
86 | if ( ! item ) { | 88 | if ( ! item ) { |
87 | return i18n("Click in the cell or\non the date label\nto add an event!"); | 89 | return i18n("Click in the cell\nto add an event!"); |
88 | } | 90 | } |
89 | return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence()); | 91 | return KIncidenceFormatter::instance()->getFormattedText(((MonthViewItem*) item)->incidence()); |
@@ -296,5 +298,12 @@ MonthViewCell::MonthViewCell( KOMonthView *parent) | |||
296 | SLOT( selection( QListBoxItem * ) ) ); | 298 | SLOT( selection( QListBoxItem * ) ) ); |
297 | } | 299 | } |
298 | 300 | #ifdef DESKTOP_VERSION | |
301 | QToolTipGroup *MonthViewCell::toolTipGroup() | ||
302 | { | ||
303 | if (!mToolTipGroup) mToolTipGroup = new QToolTipGroup(0); | ||
304 | return mToolTipGroup; | ||
305 | } | ||
306 | #endif | ||
307 | |||
299 | void MonthViewCell::setDate( const QDate &date ) | 308 | void MonthViewCell::setDate( const QDate &date ) |
300 | { | 309 | { |
@@ -393,4 +402,8 @@ void MonthViewCell::updateCell() | |||
393 | } | 402 | } |
394 | mItemList->clear(); | 403 | mItemList->clear(); |
404 | #ifdef DESKTOP_VERSION | ||
405 | QToolTip::remove(this); | ||
406 | #endif | ||
407 | QString tipText(""); | ||
395 | //qApp->processEvents(); | 408 | //qApp->processEvents(); |
396 | if ( !mHolidayString.isEmpty() ) { | 409 | if ( !mHolidayString.isEmpty() ) { |
@@ -398,4 +411,5 @@ void MonthViewCell::updateCell() | |||
398 | item->setPalette( mHolidayPalette ); | 411 | item->setPalette( mHolidayPalette ); |
399 | mItemList->insertItem( item ); | 412 | mItemList->insertItem( item ); |
413 | tipText += mHolidayString+"\n"; | ||
400 | } | 414 | } |
401 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); | 415 | //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2); |
@@ -429,10 +443,14 @@ void MonthViewCell::updateCell() | |||
429 | } | 443 | } |
430 | text = prefix + event->summary(); | 444 | text = prefix + event->summary(); |
445 | tipText += text; | ||
431 | } else { | 446 | } else { |
432 | if (event->doesFloat()) | 447 | if (event->doesFloat()) { |
433 | text = event->summary(); | 448 | text = event->summary(); |
449 | tipText += text; | ||
450 | } | ||
434 | else { | 451 | else { |
435 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 452 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
436 | text += " " + event->summary(); | 453 | text += " " + event->summary(); |
454 | tipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | ||
437 | } | 455 | } |
438 | } | 456 | } |
@@ -484,6 +502,9 @@ void MonthViewCell::updateCell() | |||
484 | 502 | ||
485 | } | 503 | } |
486 | if ( insert ) | 504 | if ( insert ) { |
487 | mItemList->insertItem( item ); | 505 | mItemList->insertItem( item ); |
506 | tipText += "\n"; | ||
507 | } else | ||
508 | tipText = ""; | ||
488 | } | 509 | } |
489 | 510 | ||
@@ -528,5 +549,11 @@ void MonthViewCell::updateCell() | |||
528 | item->setPalette( pal ); | 549 | item->setPalette( pal ); |
529 | mItemList->insertItem( item ); | 550 | mItemList->insertItem( item ); |
551 | tipText += text+"\n"; | ||
530 | } | 552 | } |
553 | #ifdef DESKTOP_VERSION | ||
554 | if (tipText != "") | ||
555 | QToolTip::add(this,tipText,toolTipGroup(),""); | ||
556 | #endif | ||
557 | |||
531 | //setMyPalette(); | 558 | //setMyPalette(); |
532 | setMyPalette(); | 559 | setMyPalette(); |
@@ -815,4 +842,7 @@ void KOMonthView::updateConfig() | |||
815 | mCells[i]->updateConfig(); | 842 | mCells[i]->updateConfig(); |
816 | } | 843 | } |
844 | #ifdef DESKTOP_VERSION | ||
845 | MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); | ||
846 | #endif | ||
817 | } | 847 | } |
818 | 848 | ||
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index 5124057..4c1567c 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -37,4 +37,8 @@ | |||
37 | #include "koeventview.h" | 37 | #include "koeventview.h" |
38 | 38 | ||
39 | #ifdef DESKTOP_VERSION | ||
40 | class QToolTipGroup; | ||
41 | #endif | ||
42 | |||
39 | class KOWeekButton : public QPushButton | 43 | class KOWeekButton : public QPushButton |
40 | { | 44 | { |
@@ -141,4 +145,7 @@ class MonthViewCell : public QWidget | |||
141 | void select(); | 145 | void select(); |
142 | 146 | ||
147 | #ifdef DESKTOP_VERSION | ||
148 | static QToolTipGroup *toolTipGroup(); | ||
149 | #endif | ||
143 | signals: | 150 | signals: |
144 | void defaultAction( Incidence * ); | 151 | void defaultAction( Incidence * ); |
@@ -168,5 +175,7 @@ class MonthViewCell : public QWidget | |||
168 | QPushButton *mLabel; | 175 | QPushButton *mLabel; |
169 | QListBox *mItemList; | 176 | QListBox *mItemList; |
170 | 177 | #ifdef DESKTOP_VERSION | |
178 | static QToolTipGroup *mToolTipGroup; | ||
179 | #endif | ||
171 | QSize mLabelSize; | 180 | QSize mLabelSize; |
172 | QSize mLabelBigSize; | 181 | QSize mLabelBigSize; |