author | zautrix <zautrix> | 2005-04-05 09:30:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-05 09:30:00 (UTC) |
commit | 53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216 (patch) (unidiff) | |
tree | 8dfcb059271cbfd4e28425d85dea747aa998594d | |
parent | 768858848f466a726e2f50b777345976828cc2ff (diff) | |
download | kdepimpi-53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216.zip kdepimpi-53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216.tar.gz kdepimpi-53d7ec81939a9cf7ea2f63f133c1b61b2e2a9216.tar.bz2 |
fix
-rw-r--r-- | korganizer/kodaymatrix.cpp | 144 | ||||
-rw-r--r-- | korganizer/kodaymatrix.h | 2 | ||||
-rw-r--r-- | korganizer/komonthview.cpp | 32 | ||||
-rw-r--r-- | korganizer/komonthview.h | 6 |
4 files changed, 172 insertions, 12 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index c7e1b45..322131f 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -114,16 +114,17 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const | |||
114 | oldH = 0; | 114 | oldH = 0; |
115 | myPix.resize( 150, 120 ); | 115 | myPix.resize( 150, 120 ); |
116 | mRedrawNeeded = true; | 116 | mRedrawNeeded = true; |
117 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); | 117 | mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); |
118 | mPendingUpdateBeforeRepaint = false; | 118 | mPendingUpdateBeforeRepaint = false; |
119 | mouseDown = false; | 119 | mouseDown = false; |
120 | // initialize dynamic arrays | 120 | // initialize dynamic arrays |
121 | bDays.resize ( NUMDAYS ); | 121 | bDays.resize ( NUMDAYS ); |
122 | pDays.resize ( NUMDAYS ); | ||
122 | hDays.resize ( NUMDAYS ); | 123 | hDays.resize ( NUMDAYS ); |
123 | eDays.resize ( NUMDAYS ); | 124 | eDays.resize ( NUMDAYS ); |
124 | days = new QDate[NUMDAYS]; | 125 | days = new QDate[NUMDAYS]; |
125 | daylbls = new QString[NUMDAYS]; | 126 | daylbls = new QString[NUMDAYS]; |
126 | //events = new int[NUMDAYS]; | 127 | //events = new int[NUMDAYS]; |
127 | mToolTip = new DynamicTip(this); | 128 | mToolTip = new DynamicTip(this); |
128 | 129 | ||
129 | // set default values used for drawing the matrix | 130 | // set default values used for drawing the matrix |
@@ -335,39 +336,173 @@ void KODayMatrix::recalculateToday() | |||
335 | void KODayMatrix::updateView() | 336 | void KODayMatrix::updateView() |
336 | { | 337 | { |
337 | updateView(startdate); | 338 | updateView(startdate); |
338 | } | 339 | } |
339 | void KODayMatrix::repaintViewTimed() | 340 | void KODayMatrix::repaintViewTimed() |
340 | { | 341 | { |
341 | mRedrawNeeded = true; | 342 | mRedrawNeeded = true; |
342 | bDays.fill( false); | 343 | bDays.fill( false); |
344 | pDays.fill( false); | ||
343 | hDays.fill( false); | 345 | hDays.fill( false); |
344 | eDays.fill( false); | 346 | eDays.fill( false); |
345 | mRepaintTimer->stop(); | 347 | mRepaintTimer->stop(); |
348 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | ||
349 | int i; | ||
350 | for(i = 0; i < NUMDAYS; i++) { | ||
351 | if ( ( (i+startDay) % 7 == 0 ) ) { | ||
352 | pDays.setBit(i); | ||
353 | } | ||
354 | } | ||
346 | repaint(false); | 355 | repaint(false); |
347 | } | 356 | } |
357 | void KODayMatrix::computeEvent(Event *event, int i ) | ||
358 | { | ||
359 | QString holiStr = mHolidays[i]; | ||
360 | if ( event->isHoliday()) { | ||
361 | pDays.setBit(i); | ||
362 | hDays.setBit(i); | ||
363 | if ( !holiStr.isEmpty() ) | ||
364 | holiStr += "\n"; | ||
365 | holiStr += event->summary(); | ||
366 | if ( !event->location().isEmpty() ) | ||
367 | holiStr += " (" + event->location() + ")"; | ||
368 | mHolidays[i] =holiStr ; | ||
369 | } | ||
370 | if ( event->isBirthday()) { | ||
371 | pDays.setBit(i); | ||
372 | if ( !holiStr.isEmpty() ) | ||
373 | holiStr += "\n"; | ||
374 | holiStr += i18n("Birthday") + ": "+event->summary(); | ||
375 | if ( !event->location().isEmpty() ) | ||
376 | holiStr += " (" + event->location() + ")"; | ||
377 | bDays.setBit(i); | ||
378 | mHolidays[i] =holiStr ; | ||
379 | } | ||
380 | eDays.setBit(i); | ||
381 | } | ||
348 | void KODayMatrix::updateViewTimed() | 382 | void KODayMatrix::updateViewTimed() |
349 | { | 383 | { |
350 | mUpdateTimer->stop(); | 384 | mUpdateTimer->stop(); |
351 | if ( !mCalendar ) { | 385 | if ( !mCalendar ) { |
352 | qDebug("NOT CAL "); | 386 | qDebug("NOT CAL "); |
353 | return; | 387 | return; |
354 | } | 388 | } |
389 | #if 1 | ||
390 | |||
391 | int i; | ||
392 | int timeSpan = NUMDAYS-1; | ||
393 | QPtrList<Event> events = mCalendar->events(); | ||
394 | Event *event; | ||
395 | QDateTime dt; | ||
396 | bool ok; | ||
397 | bDays.fill( false); | ||
398 | pDays.fill( false); | ||
399 | hDays.fill( false); | ||
400 | eDays.fill( false); | ||
401 | mHolidays.clear(); | ||
402 | QDate mStartDate = days[0]; | ||
403 | QDate endDate = mStartDate.addDays( timeSpan ); | ||
404 | for( event = events.first(); event; event = events.next() ) { // for event | ||
405 | ushort recurType = event->recurrence()->doesRecur(); | ||
406 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | ||
407 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | ||
408 | continue; | ||
409 | } | ||
410 | if ( event->doesRecur() ) { | ||
411 | bool last; | ||
412 | QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last ); | ||
413 | QDateTime incidenceEnd; | ||
414 | int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date() ); | ||
415 | bool invalid = false; | ||
416 | while( true ) { | ||
417 | if ( incidenceStart.isValid() ) { | ||
418 | incidenceEnd = incidenceStart.addDays( eventlen ); | ||
419 | int st = incidenceStart.date().daysTo( endDate ); | ||
420 | if ( st >= 0 ) { // start before timeend | ||
421 | int end = mStartDate.daysTo( incidenceEnd.date() ); | ||
422 | if ( end >= 0 ) { // end after timestart --- got one! | ||
423 | //normalize | ||
424 | st = timeSpan - st; | ||
425 | if ( st < 0 ) st = 0; | ||
426 | if ( end > timeSpan ) end = timeSpan; | ||
427 | int iii; | ||
428 | //qDebug("found %s %d %d ",event->summary().latin1(), st, end ); | ||
429 | for ( iii = st;iii<= end;++iii) { | ||
430 | computeEvent( event, iii ); | ||
431 | } | ||
432 | } | ||
433 | } | ||
434 | } else { | ||
435 | if ( invalid ) | ||
436 | break; | ||
437 | invalid = true; | ||
438 | //qDebug("invalid %s", event->summary().latin1()); | ||
439 | incidenceStart = QDateTime( mStartDate ).addSecs( -2 );; | ||
440 | } | ||
441 | if ( last ) | ||
442 | break; | ||
443 | bool ok; | ||
444 | incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok ); | ||
445 | if ( ! ok ) | ||
446 | break; | ||
447 | if ( incidenceStart.date() > endDate ) | ||
448 | break; | ||
449 | } | ||
450 | } else { // no recur | ||
451 | int st = event->dtStart().date().daysTo( endDate ); | ||
452 | if ( st >= 0 ) { // start before timeend | ||
453 | int end = mStartDate.daysTo( event->dtEnd().date() ); | ||
454 | if ( end >= 0 ) { // end after timestart --- got one! | ||
455 | //normalize | ||
456 | st = timeSpan - st; | ||
457 | if ( st < 0 ) st = 0; | ||
458 | if ( end > timeSpan ) end = timeSpan; | ||
459 | int iii; | ||
460 | for ( iii = st;iii<= end;++iii) | ||
461 | computeEvent( event, iii ); | ||
462 | } | ||
463 | } | ||
464 | } | ||
465 | } | ||
466 | int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday | ||
467 | for(i = 0; i < NUMDAYS; i++) { | ||
468 | if ( ( (i+startDay) % 7 == 0 ) ) { | ||
469 | pDays.setBit(i); | ||
470 | } | ||
471 | } | ||
472 | |||
473 | #if 0 | ||
474 | // insert due todos | ||
475 | QPtrList<Todo> todos = calendar()->todos( ); | ||
476 | Todo *todo; | ||
477 | for(todo = todos.first(); todo; todo = todos.next()) { | ||
478 | //insertTodo( todo ); | ||
479 | if ( todo->hasDueDate() ) { | ||
480 | int day = mStartDate.daysTo( todo->dtDue().date() ); | ||
481 | if ( day >= 0 && day < timeSpan + 1) { | ||
482 | (*cells)[day]->insertTodo( todo ); | ||
483 | } | ||
484 | } | ||
485 | } | ||
486 | #endif | ||
487 | |||
488 | #else | ||
355 | //qDebug("KODayMatrix::updateViewTimed "); | 489 | //qDebug("KODayMatrix::updateViewTimed "); |
356 | for(int i = 0; i < NUMDAYS; i++) { | 490 | for(int i = 0; i < NUMDAYS; i++) { |
357 | // if events are set for the day then remember to draw it bold | 491 | // if events are set for the day then remember to draw it bold |
358 | QPtrList<Event> eventlist = mCalendar->events(days[i]); | 492 | QPtrList<Event> eventlist = mCalendar->events(days[i]); |
359 | Event *event; | 493 | Event *event; |
360 | int numEvents = eventlist.count(); | 494 | int numEvents = eventlist.count(); |
361 | QString holiStr = ""; | 495 | QString holiStr = ""; |
362 | bDays.clearBit(i); | 496 | bDays.clearBit(i); |
363 | hDays.clearBit(i); | 497 | hDays.clearBit(i); |
364 | eDays.clearBit(i); | 498 | eDays.clearBit(i); |
365 | for(event=eventlist.first();event != 0;event=eventlist.next()) { | 499 | for(event=eventlist.first();event != 0;event=eventlist.next()) { |
500 | qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF "); | ||
366 | ushort recurType = event->recurrence()->doesRecur(); | 501 | ushort recurType = event->recurrence()->doesRecur(); |
367 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || | 502 | if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || |
368 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { | 503 | (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { |
369 | numEvents--; | 504 | numEvents--; |
370 | } | 505 | } |
371 | if ( event->isHoliday()) { | 506 | if ( event->isHoliday()) { |
372 | hDays.setBit(i); | 507 | hDays.setBit(i); |
373 | if ( !holiStr.isEmpty() ) | 508 | if ( !holiStr.isEmpty() ) |
@@ -390,16 +525,17 @@ void KODayMatrix::updateViewTimed() | |||
390 | //if it is a holy day then draw it red. Sundays are consider holidays, too | 525 | //if it is a holy day then draw it red. Sundays are consider holidays, too |
391 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || | 526 | if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || |
392 | !holiStr.isEmpty()) { | 527 | !holiStr.isEmpty()) { |
393 | mHolidays[i] = holiStr; | 528 | mHolidays[i] = holiStr; |
394 | } else { | 529 | } else { |
395 | mHolidays[i] = QString::null; | 530 | mHolidays[i] = QString::null; |
396 | } | 531 | } |
397 | } | 532 | } |
533 | #endif | ||
398 | mRedrawNeeded = true; | 534 | mRedrawNeeded = true; |
399 | if ( ! mPendingUpdateBeforeRepaint ) | 535 | if ( ! mPendingUpdateBeforeRepaint ) |
400 | repaint(false); | 536 | repaint(false); |
401 | } | 537 | } |
402 | void KODayMatrix::updateView(QDate actdate) | 538 | void KODayMatrix::updateView(QDate actdate) |
403 | { | 539 | { |
404 | 540 | ||
405 | if ( ! actdate.isValid() ) { | 541 | if ( ! actdate.isValid() ) { |
@@ -437,17 +573,17 @@ void KODayMatrix::updateView(QDate actdate) | |||
437 | mPendingUpdateBeforeRepaint = true; | 573 | mPendingUpdateBeforeRepaint = true; |
438 | } else { | 574 | } else { |
439 | #ifdef DESKTOP_VERSION | 575 | #ifdef DESKTOP_VERSION |
440 | //mRepaintTimer->start( 100 ); | 576 | //mRepaintTimer->start( 100 ); |
441 | //updateViewTimed(); | 577 | //updateViewTimed(); |
442 | mUpdateTimer->start( 50 ); | 578 | mUpdateTimer->start( 50 ); |
443 | #else | 579 | #else |
444 | mRepaintTimer->start( 350 ); | 580 | mRepaintTimer->start( 350 ); |
445 | mUpdateTimer->start( 1200 ); | 581 | mUpdateTimer->start( 800 ); |
446 | #endif | 582 | #endif |
447 | } | 583 | } |
448 | } | 584 | } |
449 | void KODayMatrix::updateEvents() | 585 | void KODayMatrix::updateEvents() |
450 | { | 586 | { |
451 | if ( !mCalendar ) return; | 587 | if ( !mCalendar ) return; |
452 | 588 | ||
453 | for( int i = 0; i < NUMDAYS; i++ ) { | 589 | for( int i = 0; i < NUMDAYS; i++ ) { |
@@ -868,17 +1004,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
868 | if (today == i) { | 1004 | if (today == i) { |
869 | tmppen = p.pen(); | 1005 | tmppen = p.pen(); |
870 | QPen mTodayPen(p.pen()); | 1006 | QPen mTodayPen(p.pen()); |
871 | if ( daysize.width() < 20 ) | 1007 | if ( daysize.width() < 20 ) |
872 | mTodayPen.setWidth(1); | 1008 | mTodayPen.setWidth(1); |
873 | else | 1009 | else |
874 | mTodayPen.setWidth(mTodayMarginWidth); | 1010 | mTodayPen.setWidth(mTodayMarginWidth); |
875 | //draw red rectangle for holidays | 1011 | //draw red rectangle for holidays |
876 | if (!mHolidays[i].isNull()) { | 1012 | if (pDays.testBit(i)) { |
877 | if (actcol == mDefaultTextColor) { | 1013 | if (actcol == mDefaultTextColor) { |
878 | mTodayPen.setColor(KOPrefs::instance()->mHolidayColor); | 1014 | mTodayPen.setColor(KOPrefs::instance()->mHolidayColor); |
879 | } else { | 1015 | } else { |
880 | mTodayPen.setColor(mHolidayColorShaded); | 1016 | mTodayPen.setColor(mHolidayColorShaded); |
881 | } | 1017 | } |
882 | } | 1018 | } |
883 | //draw gray rectangle for today if in selection | 1019 | //draw gray rectangle for today if in selection |
884 | if (i >= mSelStartT && i <= mSelEndT) { | 1020 | if (i >= mSelStartT && i <= mSelEndT) { |
@@ -909,17 +1045,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
909 | // if any events are on that day then draw it using a bold font | 1045 | // if any events are on that day then draw it using a bold font |
910 | if ( eDays.testBit(i) ) { | 1046 | if ( eDays.testBit(i) ) { |
911 | QFont myFont = font(); | 1047 | QFont myFont = font(); |
912 | myFont.setBold(true); | 1048 | myFont.setBold(true); |
913 | p.setFont(myFont); | 1049 | p.setFont(myFont); |
914 | } | 1050 | } |
915 | 1051 | ||
916 | // if it is a holiday then use the default holiday color | 1052 | // if it is a holiday then use the default holiday color |
917 | if ( !mHolidays[i].isNull()) { | 1053 | if ( pDays.testBit(i)) { |
918 | if ( bDays.testBit(i) ) { | 1054 | if ( bDays.testBit(i) ) { |
919 | if ( hDays.testBit(i) ) | 1055 | if ( hDays.testBit(i) ) |
920 | p.setPen(QColor(Qt::green)); | 1056 | p.setPen(QColor(Qt::green)); |
921 | else | 1057 | else |
922 | p.setPen(QColor(Qt::green).dark()); | 1058 | p.setPen(QColor(Qt::green).dark()); |
923 | } else { | 1059 | } else { |
924 | if (actcol == mDefaultTextColor ) { | 1060 | if (actcol == mDefaultTextColor ) { |
925 | p.setPen(KOPrefs::instance()->mHolidayColor); | 1061 | p.setPen(KOPrefs::instance()->mHolidayColor); |
@@ -948,17 +1084,17 @@ void KODayMatrix::paintEvent(QPaintEvent * pevent) | |||
948 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); | 1084 | //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow); |
949 | ++addCol;//++addCol; | 1085 | ++addCol;//++addCol; |
950 | if ( row == 0) | 1086 | if ( row == 0) |
951 | addRow = 1; | 1087 | addRow = 1; |
952 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, | 1088 | p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight, |
953 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); | 1089 | Qt::AlignHCenter | Qt::AlignVCenter, daylbls[i]); |
954 | 1090 | ||
955 | // reset color to actual color | 1091 | // reset color to actual color |
956 | if (!mHolidays[i].isNull()) { | 1092 | if (pDays.testBit(i)) { |
957 | p.setPen(actcol); | 1093 | p.setPen(actcol); |
958 | } | 1094 | } |
959 | // reset bold font to plain font | 1095 | // reset bold font to plain font |
960 | if ( eDays.testBit(i)) { | 1096 | if ( eDays.testBit(i)) { |
961 | QFont myFont = font(); | 1097 | QFont myFont = font(); |
962 | myFont.setBold(false); | 1098 | myFont.setBold(false); |
963 | p.setFont(myFont); | 1099 | p.setFont(myFont); |
964 | } | 1100 | } |
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index d725ead..b686bd7 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h | |||
@@ -222,23 +222,25 @@ protected: | |||
222 | 222 | ||
223 | void dragLeaveEvent(QDragLeaveEvent *); | 223 | void dragLeaveEvent(QDragLeaveEvent *); |
224 | 224 | ||
225 | void dropEvent(QDropEvent *); | 225 | void dropEvent(QDropEvent *); |
226 | 226 | ||
227 | void resizeEvent(QResizeEvent *); | 227 | void resizeEvent(QResizeEvent *); |
228 | 228 | ||
229 | private: | 229 | private: |
230 | void computeEvent(Event *even, int dayindex ); | ||
230 | int oldW, oldH; | 231 | int oldW, oldH; |
231 | bool mRedrawNeeded; | 232 | bool mRedrawNeeded; |
232 | KODaymatrixWhatsThis* mKODaymatrixWhatsThis; | 233 | KODaymatrixWhatsThis* mKODaymatrixWhatsThis; |
233 | bool mouseDown; | 234 | bool mouseDown; |
234 | QBitArray bDays; | 235 | QBitArray bDays; |
235 | QBitArray hDays; | 236 | QBitArray hDays; |
236 | QBitArray eDays; | 237 | QBitArray eDays; |
238 | QBitArray pDays; | ||
237 | QPixmap myPix; | 239 | QPixmap myPix; |
238 | QTimer* mUpdateTimer; | 240 | QTimer* mUpdateTimer; |
239 | QTimer* mRepaintTimer; | 241 | QTimer* mRepaintTimer; |
240 | bool mDayChanged; | 242 | bool mDayChanged; |
241 | bool mPendingUpdateBeforeRepaint; | 243 | bool mPendingUpdateBeforeRepaint; |
242 | 244 | ||
243 | /** returns the index of the day located at the matrix's widget (x,y) position. | 245 | /** returns the index of the day located at the matrix's widget (x,y) position. |
244 | * | 246 | * |
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 1ed288b..425496a 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -264,29 +264,31 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s) | |||
264 | setText( s ); | 264 | setText( s ); |
265 | mMultiday = 0; | 265 | mMultiday = 0; |
266 | mIncidence = incidence; | 266 | mIncidence = incidence; |
267 | mDate = qd; | 267 | mDate = qd; |
268 | mRecur = false; | 268 | mRecur = false; |
269 | mAlarm = false; | 269 | mAlarm = false; |
270 | mReply = false; | 270 | mReply = false; |
271 | mInfo = false; | 271 | mInfo = false; |
272 | mdayPos = 0; | ||
272 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; | 273 | isWeekItem = KOPrefs::instance()->mMonthViewWeek; |
273 | //qDebug("NEWWWWWWWWWWWWW "); | 274 | //qDebug("NEWWWWWWWWWWWWW "); |
274 | } | 275 | } |
275 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) | 276 | void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s) |
276 | { | 277 | { |
277 | setText( s ); | 278 | setText( s ); |
278 | mMultiday = 0; | 279 | mMultiday = 0; |
279 | mIncidence = incidence; | 280 | mIncidence = incidence; |
280 | mDate = qd; | 281 | mDate = qd; |
281 | mRecur = false; | 282 | mRecur = false; |
282 | mAlarm = false; | 283 | mAlarm = false; |
283 | mReply = false; | 284 | mReply = false; |
284 | mInfo = false; | 285 | mInfo = false; |
286 | mdayPos = 0; | ||
285 | //qDebug("recucleeeeeeeeeeeeeeeee "); | 287 | //qDebug("recucleeeeeeeeeeeeeeeee "); |
286 | } | 288 | } |
287 | 289 | ||
288 | void MonthViewItem::paint(QPainter *p) | 290 | void MonthViewItem::paint(QPainter *p) |
289 | { | 291 | { |
290 | if ( mblockRepaint ) { | 292 | if ( mblockRepaint ) { |
291 | //qDebug("block "); | 293 | //qDebug("block "); |
292 | return; | 294 | return; |
@@ -565,17 +567,17 @@ void MonthViewCell::setHoliday( const QString &holiday ) | |||
565 | 567 | ||
566 | if ( !holiday.isEmpty() ) { | 568 | if ( !holiday.isEmpty() ) { |
567 | setHoliday( true ); | 569 | setHoliday( true ); |
568 | } | 570 | } |
569 | } | 571 | } |
570 | 572 | ||
571 | void MonthViewCell::startUpdateCell() | 573 | void MonthViewCell::startUpdateCell() |
572 | { | 574 | { |
573 | 575 | mdayCount = 0; | |
574 | setFocusPolicy(NoFocus); | 576 | setFocusPolicy(NoFocus); |
575 | if ( !mMonthView->isUpdatePossible() ) | 577 | if ( !mMonthView->isUpdatePossible() ) |
576 | return; | 578 | return; |
577 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 579 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
578 | while ( mitem ) { | 580 | while ( mitem ) { |
579 | mitem->setBlockRepaint( true ); | 581 | mitem->setBlockRepaint( true ); |
580 | mitem = (MonthViewItem *)mitem->next(); | 582 | mitem = (MonthViewItem *)mitem->next(); |
581 | } | 583 | } |
@@ -616,26 +618,26 @@ void MonthViewCell::startUpdateCell() | |||
616 | MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); | 618 | MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString ); |
617 | item->setPalette( mHolidayPalette ); | 619 | item->setPalette( mHolidayPalette ); |
618 | insertItem( item ); | 620 | insertItem( item ); |
619 | mToolTip.append ( mHolidayString ); | 621 | mToolTip.append ( mHolidayString ); |
620 | } | 622 | } |
621 | #endif | 623 | #endif |
622 | } | 624 | } |
623 | 625 | ||
624 | void MonthViewCell::insertEvent(Event *event) | 626 | int MonthViewCell::insertEvent(Event *event) |
625 | { | 627 | { |
626 | QString mToolTipText; | 628 | QString mToolTipText; |
627 | setFocusPolicy(WheelFocus); | 629 | setFocusPolicy(WheelFocus); |
628 | if ( !(event->doesRecur() == Recurrence::rNone) ) { | 630 | if ( !(event->doesRecur() == Recurrence::rNone) ) { |
629 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) | 631 | if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily ) |
630 | return; | 632 | return mdayCount; |
631 | else | 633 | else |
632 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) | 634 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) |
633 | return; | 635 | return mdayCount; |
634 | } | 636 | } |
635 | 637 | ||
636 | if ( event->isHoliday()) { | 638 | if ( event->isHoliday()) { |
637 | setHoliday( true ); | 639 | setHoliday( true ); |
638 | if ( mDate.dayOfWeek() == 7 ) | 640 | if ( mDate.dayOfWeek() == 7 ) |
639 | setLineWidth( 3 ); | 641 | setLineWidth( 3 ); |
640 | } | 642 | } |
641 | QString text; | 643 | QString text; |
@@ -725,18 +727,34 @@ void MonthViewCell::insertEvent(Event *event) | |||
725 | if ( me->status() == Attendee::NeedsAction && me->RSVP()) | 727 | if ( me->status() == Attendee::NeedsAction && me->RSVP()) |
726 | item->setReply(true && multiday < 2); | 728 | item->setReply(true && multiday < 2); |
727 | else | 729 | else |
728 | item->setReply(false); | 730 | item->setReply(false); |
729 | } else | 731 | } else |
730 | item->setReply(false); | 732 | item->setReply(false); |
731 | #endif | 733 | #endif |
732 | item->setMultiDay( multiday ); | 734 | item->setMultiDay( multiday ); |
733 | insertItem( item ); | 735 | if ( multiday ) { |
736 | insertItem( item ,mdayCount); | ||
737 | ++mdayCount; | ||
738 | } else { | ||
739 | uint i; | ||
740 | int pos = mdayCount; | ||
741 | for ( i = mdayCount; i < count();++i ) { | ||
742 | QListBoxItem* it = this->item ( i ); | ||
743 | if ( text < it->text() ) { | ||
744 | pos = i; | ||
745 | break; | ||
746 | } | ||
747 | ++pos; | ||
748 | } | ||
749 | insertItem( item ,pos); | ||
750 | } | ||
734 | mToolTip.append( mToolTipText ); | 751 | mToolTip.append( mToolTipText ); |
752 | return mdayCount; | ||
735 | } | 753 | } |
736 | void MonthViewCell::insertTodo(Todo *todo) | 754 | void MonthViewCell::insertTodo(Todo *todo) |
737 | { | 755 | { |
738 | setFocusPolicy(WheelFocus); | 756 | setFocusPolicy(WheelFocus); |
739 | QString text; | 757 | QString text; |
740 | if (todo->hasDueDate()) { | 758 | if (todo->hasDueDate()) { |
741 | if (!todo->doesFloat()) { | 759 | if (!todo->doesFloat()) { |
742 | text += KGlobal::locale()->formatTime(todo->dtDue().time()); | 760 | text += KGlobal::locale()->formatTime(todo->dtDue().time()); |
@@ -776,17 +794,17 @@ void MonthViewCell::insertTodo(Todo *todo) | |||
776 | 794 | ||
777 | } else { | 795 | } else { |
778 | pal = mStandardPalette ; | 796 | pal = mStandardPalette ; |
779 | } | 797 | } |
780 | item->setPalette( pal ); | 798 | item->setPalette( pal ); |
781 | item->setRecur( todo->recurrence()->doesRecur() ); | 799 | item->setRecur( todo->recurrence()->doesRecur() ); |
782 | item->setAlarm( todo->isAlarmEnabled() ); | 800 | item->setAlarm( todo->isAlarmEnabled() ); |
783 | item->setMoreInfo( todo->description().length() > 0 ); | 801 | item->setMoreInfo( todo->description().length() > 0 ); |
784 | insertItem( item ); | 802 | insertItem( item , count()); |
785 | mToolTip.append( text ); | 803 | mToolTip.append( text ); |
786 | } | 804 | } |
787 | void MonthViewCell::repaintfinishUpdateCell() | 805 | void MonthViewCell::repaintfinishUpdateCell() |
788 | { | 806 | { |
789 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); | 807 | MonthViewItem *mitem = (MonthViewItem*) firstItem (); |
790 | while ( mitem ) { | 808 | while ( mitem ) { |
791 | mitem->setBlockRepaint( false ); | 809 | mitem->setBlockRepaint( false ); |
792 | updateItem ( mitem ); | 810 | updateItem ( mitem ); |
@@ -799,17 +817,17 @@ void MonthViewCell::finishUpdateCell() | |||
799 | 817 | ||
800 | 818 | ||
801 | #ifdef DESKTOP_VERSION | 819 | #ifdef DESKTOP_VERSION |
802 | if (mToolTip.count() > 0 ) { | 820 | if (mToolTip.count() > 0 ) { |
803 | mToolTip.sort(); | 821 | mToolTip.sort(); |
804 | QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); | 822 | QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),""); |
805 | } | 823 | } |
806 | #endif | 824 | #endif |
807 | sort(); | 825 | //sort(); |
808 | //setMyPalette(); | 826 | //setMyPalette(); |
809 | setMyPalette(); | 827 | setMyPalette(); |
810 | 828 | ||
811 | resizeEvent( 0 ); | 829 | resizeEvent( 0 ); |
812 | 830 | ||
813 | } | 831 | } |
814 | void MonthViewCell::updateCell() | 832 | void MonthViewCell::updateCell() |
815 | { | 833 | { |
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index e962756..e39eeb0 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h | |||
@@ -103,31 +103,34 @@ class MonthViewItem: public QListBoxItem | |||
103 | public: | 103 | public: |
104 | MonthViewItem( Incidence *, QDate qd, const QString & title ); | 104 | MonthViewItem( Incidence *, QDate qd, const QString & title ); |
105 | void recycle( Incidence *incidence, QDate qd, const QString & s); | 105 | void recycle( Incidence *incidence, QDate qd, const QString & s); |
106 | void setRecur(bool on) { mRecur = on; } | 106 | void setRecur(bool on) { mRecur = on; } |
107 | void setAlarm(bool on) { mAlarm = on; } | 107 | void setAlarm(bool on) { mAlarm = on; } |
108 | void setReply(bool on) { mReply = on; } | 108 | void setReply(bool on) { mReply = on; } |
109 | void setMoreInfo(bool on) { mInfo = on; } | 109 | void setMoreInfo(bool on) { mInfo = on; } |
110 | void setMultiDay(int type) { mMultiday = type; } | 110 | void setMultiDay(int type) { mMultiday = type; } |
111 | void setMultiDayPos(int type) { mdayPos = type; } | ||
112 | int gettMultiDayPos() { return mdayPos; } | ||
111 | void setBlockRepaint(bool on) { mblockRepaint = on; } | 113 | void setBlockRepaint(bool on) { mblockRepaint = on; } |
112 | 114 | ||
113 | 115 | ||
114 | void setPalette(const QPalette &p) { mPalette = p; } | 116 | void setPalette(const QPalette &p) { mPalette = p; } |
115 | QPalette palette() const { return mPalette; } | 117 | QPalette palette() const { return mPalette; } |
116 | 118 | ||
117 | Incidence *incidence() const { return mIncidence; } | 119 | Incidence *incidence() const { return mIncidence; } |
118 | QDate incidenceDate() { return mDate; } | 120 | QDate incidenceDate() { return mDate; } |
119 | 121 | ||
120 | protected: | 122 | protected: |
121 | virtual void paint(QPainter *); | 123 | virtual void paint(QPainter *); |
122 | virtual int height(const QListBox *) const; | 124 | virtual int height(const QListBox *) const; |
123 | virtual int width(const QListBox *) const; | 125 | virtual int width(const QListBox *) const; |
124 | 126 | ||
125 | private: | 127 | private: |
128 | int mdayPos; | ||
126 | bool isWeekItem; | 129 | bool isWeekItem; |
127 | bool mblockRepaint; | 130 | bool mblockRepaint; |
128 | int mMultiday; | 131 | int mMultiday; |
129 | bool mRecur; | 132 | bool mRecur; |
130 | bool mAlarm; | 133 | bool mAlarm; |
131 | bool mReply; | 134 | bool mReply; |
132 | bool mInfo; | 135 | bool mInfo; |
133 | 136 | ||
@@ -155,17 +158,17 @@ class MonthViewCell : public KNoScrollListBox | |||
155 | 158 | ||
156 | void setHoliday( bool ); | 159 | void setHoliday( bool ); |
157 | void setHoliday( const QString & ); | 160 | void setHoliday( const QString & ); |
158 | 161 | ||
159 | void updateCell(); | 162 | void updateCell(); |
160 | void startUpdateCell(); | 163 | void startUpdateCell(); |
161 | void finishUpdateCell(); | 164 | void finishUpdateCell(); |
162 | void repaintfinishUpdateCell(); | 165 | void repaintfinishUpdateCell(); |
163 | void insertEvent(Event *); | 166 | int insertEvent(Event *); |
164 | void insertTodo(Todo *); | 167 | void insertTodo(Todo *); |
165 | 168 | ||
166 | void updateConfig( bool bigFont = false ); | 169 | void updateConfig( bool bigFont = false ); |
167 | 170 | ||
168 | void enableScrollBars( bool ); | 171 | void enableScrollBars( bool ); |
169 | 172 | ||
170 | Incidence *selectedIncidence(); | 173 | Incidence *selectedIncidence(); |
171 | QDate selectedIncidenceDate(); | 174 | QDate selectedIncidenceDate(); |
@@ -192,16 +195,17 @@ public slots: | |||
192 | protected slots: | 195 | protected slots: |
193 | void defaultAction( QListBoxItem * ); | 196 | void defaultAction( QListBoxItem * ); |
194 | void contextMenu( QListBoxItem * ); | 197 | void contextMenu( QListBoxItem * ); |
195 | void selection( QListBoxItem * ); | 198 | void selection( QListBoxItem * ); |
196 | void cellClicked( QListBoxItem * ); | 199 | void cellClicked( QListBoxItem * ); |
197 | void newEvent(); | 200 | void newEvent(); |
198 | 201 | ||
199 | private: | 202 | private: |
203 | int mdayCount; | ||
200 | QPtrList <MonthViewItem> mAvailItemList; | 204 | QPtrList <MonthViewItem> mAvailItemList; |
201 | KOMonthView *mMonthView; | 205 | KOMonthView *mMonthView; |
202 | int currentPalette; | 206 | int currentPalette; |
203 | 207 | ||
204 | QDate mDate; | 208 | QDate mDate; |
205 | bool mPrimary; | 209 | bool mPrimary; |
206 | bool mHoliday; | 210 | bool mHoliday; |
207 | QString mHolidayString; | 211 | QString mHolidayString; |