-rw-r--r-- | korganizer/kodaymatrix.cpp | 110 |
1 files changed, 103 insertions, 7 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 17a8546..1cde616 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -25,8 +25,9 @@ | |||
25 | #include <qevent.h> | 25 | #include <qevent.h> |
26 | #include <qpainter.h> | 26 | #include <qpainter.h> |
27 | #include <qptrlist.h> | 27 | #include <qptrlist.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | #include <qwhatsthis.h> | ||
29 | 30 | ||
30 | #include <kglobal.h> | 31 | #include <kglobal.h> |
31 | #include <kdebug.h> | 32 | #include <kdebug.h> |
32 | #include <klocale.h> | 33 | #include <klocale.h> |
@@ -57,8 +58,21 @@ DynamicTip::DynamicTip( QWidget * parent ) | |||
57 | { | 58 | { |
58 | matrix = (KODayMatrix*)parent; | 59 | matrix = (KODayMatrix*)parent; |
59 | } | 60 | } |
60 | 61 | ||
62 | class KODaymatrixWhatsThis :public QWhatsThis | ||
63 | { | ||
64 | public: | ||
65 | KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { }; | ||
66 | |||
67 | protected: | ||
68 | virtual QString text( const QPoint& p ) | ||
69 | { | ||
70 | return _view->getWhatsThisText( p ) ; | ||
71 | } | ||
72 | private: | ||
73 | KODayMatrix * _view; | ||
74 | }; | ||
61 | 75 | ||
62 | void DynamicTip::maybeTip( const QPoint &pos ) | 76 | void DynamicTip::maybeTip( const QPoint &pos ) |
63 | { | 77 | { |
64 | //calculate which cell of the matrix the mouse is in | 78 | //calculate which cell of the matrix the mouse is in |
@@ -94,12 +108,13 @@ KODayMatrix::KODayMatrix( QWidget *parent, const char *name ) | |||
94 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : | 108 | KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) : |
95 | QFrame(parent, name) | 109 | QFrame(parent, name) |
96 | #endif | 110 | #endif |
97 | { | 111 | { |
98 | 112 | new KODaymatrixWhatsThis(this); | |
99 | mPendingUpdateBeforeRepaint = false; | 113 | mPendingUpdateBeforeRepaint = false; |
100 | 114 | mouseDown = false; | |
101 | // initialize dynamic arrays | 115 | // initialize dynamic arrays |
116 | bDays.resize ( NUMDAYS ); | ||
102 | days = new QDate[NUMDAYS]; | 117 | days = new QDate[NUMDAYS]; |
103 | daylbls = new QString[NUMDAYS]; | 118 | daylbls = new QString[NUMDAYS]; |
104 | events = new int[NUMDAYS]; | 119 | events = new int[NUMDAYS]; |
105 | mToolTip = new DynamicTip(this); | 120 | mToolTip = new DynamicTip(this); |
@@ -122,8 +137,67 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const | |||
122 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); | 137 | connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() )); |
123 | mDayChanged = false; | 138 | mDayChanged = false; |
124 | updateView(); | 139 | updateView(); |
125 | } | 140 | } |
141 | QString KODayMatrix::getWhatsThisText( QPoint p ) | ||
142 | { | ||
143 | |||
144 | int tmp = getDayIndexFrom(p.x(), p.y()); | ||
145 | if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar ) | ||
146 | return QString(); | ||
147 | QDate mDate = days[tmp]; | ||
148 | QPtrList<Event> eventlist = mCalendar->events(mDate); | ||
149 | Event *event; | ||
150 | QStringList mToolTip; | ||
151 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | ||
152 | QString mToolTipText; | ||
153 | QString text; | ||
154 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day | ||
155 | if (event->isMultiDay()) { | ||
156 | QString prefix = "<->";multiday = 2; | ||
157 | QString time; | ||
158 | if ( event->doesRecur() ) { | ||
159 | if ( event->recursOn( mDate) ) { | ||
160 | prefix ="->" ;multiday = 1; | ||
161 | } | ||
162 | else { | ||
163 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); | ||
164 | if ( event->recursOn( mDate.addDays( -days)) ) { | ||
165 | prefix ="<-" ;multiday = 3; | ||
166 | } | ||
167 | } | ||
168 | } else { | ||
169 | if (mDate == event->dtStart().date()) { | ||
170 | prefix ="->" ;multiday = 1; | ||
171 | } else if (mDate == event->dtEnd().date()) { | ||
172 | prefix ="<-" ;multiday = 3; | ||
173 | } | ||
174 | } | ||
175 | if ( !event->doesFloat() ) { | ||
176 | if ( mDate == event->dtStart().date () ) | ||
177 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; | ||
178 | else if ( mDate == event->dtEnd().date () ) | ||
179 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; | ||
180 | |||
181 | } | ||
182 | text = time + event->summary(); | ||
183 | mToolTipText += prefix + text; | ||
184 | } else { | ||
185 | if (event->doesFloat()) { | ||
186 | text = event->summary(); | ||
187 | mToolTipText += text; | ||
188 | } | ||
189 | else { | ||
190 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | ||
191 | text += " " + event->summary(); | ||
192 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | ||
193 | } | ||
194 | } | ||
195 | mToolTip.append( mToolTipText ); | ||
196 | } | ||
197 | mToolTip.sort(); | ||
198 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | ||
199 | } | ||
126 | void KODayMatrix::setCalendar( Calendar *cal ) | 200 | void KODayMatrix::setCalendar( Calendar *cal ) |
127 | { | 201 | { |
128 | mCalendar = cal; | 202 | mCalendar = cal; |
129 | 203 | ||
@@ -245,8 +319,9 @@ void KODayMatrix::updateViewTimed() | |||
245 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 319 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
246 | Event *event; | 320 | Event *event; |
247 | int numEvents = eventlist.count(); | 321 | int numEvents = eventlist.count(); |
248 | QString holiStr = ""; | 322 | QString holiStr = ""; |
323 | bDays.clearBit(i); | ||
249 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 324 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
250 | ushort recurType = event->recurrence()->doesRecur(); | 325 | ushort recurType = event->recurrence()->doesRecur(); |
251 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 326 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
252 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 327 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
@@ -256,8 +331,14 @@ void KODayMatrix::updateViewTimed() | |||
256 | if ( !holiStr.isEmpty() ) | 331 | if ( !holiStr.isEmpty() ) |
257 | holiStr += "\n"; | 332 | holiStr += "\n"; |
258 | holiStr += event->summary(); | 333 | holiStr += event->summary(); |
259 | } | 334 | } |
335 | if ( event->categories().contains( i18n("Birthday") ) || event->categories().contains( "Birthday" )) { | ||
336 | if ( !holiStr.isEmpty() ) | ||
337 | holiStr += "\n"; | ||
338 | holiStr += event->summary(); | ||
339 | bDays.setBit(i); | ||
340 | } | ||
260 | } | 341 | } |
261 | events[i] = numEvents; | 342 | events[i] = numEvents; |
262 | //if it is a holy day then draw it red. Sundays are consider holidays, too | 343 | //if it is a holy day then draw it red. Sundays are consider holidays, too |
263 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || | 344 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || |
@@ -306,13 +387,13 @@ void KODayMatrix::updateView(QDate actdate) | |||
306 | if ( !isVisible() ) { | 387 | if ( !isVisible() ) { |
307 | mPendingUpdateBeforeRepaint = true; | 388 | mPendingUpdateBeforeRepaint = true; |
308 | } else { | 389 | } else { |
309 | #ifdef DESKTOP_VERSION | 390 | #ifdef DESKTOP_VERSION |
310 | //mRepaintTimer->start( 250 ); | 391 | //mRepaintTimer->start( 150 ); |
311 | mUpdateTimer->start( 250 ); | 392 | mUpdateTimer->start( 150 ); |
312 | #else | 393 | #else |
313 | mRepaintTimer->start( 350 ); | 394 | mRepaintTimer->start( 350 ); |
314 | mUpdateTimer->start( 2000 ); | 395 | mUpdateTimer->start( 1200 ); |
315 | #endif | 396 | #endif |
316 | } | 397 | } |
317 | } | 398 | } |
318 | void KODayMatrix::updateEvents() | 399 | void KODayMatrix::updateEvents() |
@@ -367,16 +448,24 @@ int KODayMatrix::getDayIndexFrom(int x, int y) | |||
367 | // ---------------------------------------------------------------------------- | 448 | // ---------------------------------------------------------------------------- |
368 | 449 | ||
369 | void KODayMatrix::mousePressEvent (QMouseEvent* e) | 450 | void KODayMatrix::mousePressEvent (QMouseEvent* e) |
370 | { | 451 | { |
452 | |||
453 | if ( e->button() == LeftButton ) | ||
454 | mouseDown = true; | ||
371 | mSelStart = getDayIndexFrom(e->x(), e->y()); | 455 | mSelStart = getDayIndexFrom(e->x(), e->y()); |
372 | if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1; | 456 | if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1; |
373 | mSelInit = mSelStart; | 457 | mSelInit = mSelStart; |
374 | } | 458 | } |
375 | 459 | ||
376 | void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) | 460 | void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) |
377 | { | 461 | { |
378 | 462 | if ( e->button() == LeftButton ) | |
463 | if ( ! mouseDown ) { | ||
464 | return; | ||
465 | } | ||
466 | else | ||
467 | mouseDown = false; | ||
379 | int tmp = getDayIndexFrom(e->x(), e->y()); | 468 | int tmp = getDayIndexFrom(e->x(), e->y()); |
380 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; | 469 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; |
381 | 470 | ||
382 | if (mSelInit > tmp) { | 471 | if (mSelInit > tmp) { |
@@ -406,8 +495,11 @@ void KODayMatrix::mouseReleaseEvent (QMouseEvent* e) | |||
406 | } | 495 | } |
407 | 496 | ||
408 | void KODayMatrix::mouseMoveEvent (QMouseEvent* e) | 497 | void KODayMatrix::mouseMoveEvent (QMouseEvent* e) |
409 | { | 498 | { |
499 | if ( ! mouseDown ) { | ||
500 | return; | ||
501 | } | ||
410 | int tmp = getDayIndexFrom(e->x(), e->y()); | 502 | int tmp = getDayIndexFrom(e->x(), e->y()); |
411 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; | 503 | if (tmp > NUMDAYS-1) tmp=NUMDAYS-1; |
412 | 504 | ||
413 | if (mSelInit > tmp) { | 505 | if (mSelInit > tmp) { |
@@ -629,19 +721,23 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
629 | } | 721 | } |
630 | 722 | ||
631 | // if it is a holiday then use the default holiday color | 723 | // if it is a holiday then use the default holiday color |
632 | if (!mHolidays[i].isNull()) { | 724 | if (!mHolidays[i].isNull()) { |
725 | if ( bDays.testBit(i) ) { | ||
726 | p.setPen(Qt::green); | ||
727 | } else { | ||
633 | if (actcol == mDefaultTextColor) { | 728 | if (actcol == mDefaultTextColor) { |
634 | p.setPen(KOPrefs::instance()->mHolidayColor); | 729 | p.setPen(KOPrefs::instance()->mHolidayColor); |
635 | } else { | 730 | } else { |
636 | p.setPen(mHolidayColorShaded); | 731 | p.setPen(mHolidayColorShaded); |
637 | } | 732 | } |
638 | } | 733 | } |
734 | } | ||
639 | 735 | ||
640 | // draw selected days with special color | 736 | // draw selected days with special color |
641 | // DO NOT specially highlight holidays in selection ! | 737 | // DO NOT specially highlight holidays in selection ! |
642 | if (i >= mSelStart && i <= mSelEnd) { | 738 | if (i >= mSelStart && i <= mSelEnd) { |
643 | p.setPen(mSelectedDaysColor); | 739 | ;//p.setPen(mSelectedDaysColor); |
644 | } | 740 | } |
645 | 741 | ||
646 | p.drawText(col*dwidth, row*dheight, dwidth, dheight, | 742 | p.drawText(col*dwidth, row*dheight, dwidth, dheight, |
647 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); | 743 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); |