author | zautrix <zautrix> | 2005-03-21 17:39:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-21 17:39:46 (UTC) |
commit | 3c5d7b484e6ab263ab4091f22815770ea8da6c9c (patch) (unidiff) | |
tree | 97f86965d7ae565fc054918978756c3953476e82 /korganizer/komonthview.cpp | |
parent | 070055b60f76ffd6907e44a4ffc2d752578f3211 (diff) | |
download | kdepimpi-3c5d7b484e6ab263ab4091f22815770ea8da6c9c.zip kdepimpi-3c5d7b484e6ab263ab4091f22815770ea8da6c9c.tar.gz kdepimpi-3c5d7b484e6ab263ab4091f22815770ea8da6c9c.tar.bz2 |
fix
-rw-r--r-- | korganizer/komonthview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 004ff50..76982b4 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp | |||
@@ -494,50 +494,49 @@ void MonthViewCell::startUpdateCell() | |||
494 | QToolTip::remove(this); | 494 | QToolTip::remove(this); |
495 | #endif | 495 | #endif |
496 | mToolTip.clear(); | 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.append ( mHolidayString ); | 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 | QString mToolTipText; | 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 ) |
512 | return; | 512 | return; |
513 | else | 513 | else |
514 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) | 514 | if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly ) |
515 | return; | 515 | return; |
516 | } | 516 | } |
517 | 517 | ||
518 | if ( event->categories().contains("Holiday") || | 518 | if ( event->isHoliday()) { |
519 | event->categories().contains(i18n("Holiday"))) { | ||
520 | setHoliday( true ); | 519 | setHoliday( true ); |
521 | if ( mDate.dayOfWeek() == 7 ) | 520 | if ( mDate.dayOfWeek() == 7 ) |
522 | mItemList->setLineWidth( 3 ); | 521 | mItemList->setLineWidth( 3 ); |
523 | } | 522 | } |
524 | QString text; | 523 | QString text; |
525 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day | 524 | int multiday = 0;// 1 = start, 2 = midddle, 3 = end day |
526 | if (event->isMultiDay()) { | 525 | if (event->isMultiDay()) { |
527 | QString prefix = "<->";multiday = 2; | 526 | QString prefix = "<->";multiday = 2; |
528 | QString time; | 527 | QString time; |
529 | if ( event->doesRecur() ) { | 528 | if ( event->doesRecur() ) { |
530 | if ( event->recursOn( mDate) ) { | 529 | if ( event->recursOn( mDate) ) { |
531 | prefix ="->" ;multiday = 1; | 530 | prefix ="->" ;multiday = 1; |
532 | } | 531 | } |
533 | else { | 532 | else { |
534 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); | 533 | int days = event->dtStart().date().daysTo ( event->dtEnd().date() ); |
535 | if ( event->recursOn( mDate.addDays( -days)) ) { | 534 | if ( event->recursOn( mDate.addDays( -days)) ) { |
536 | prefix ="<-" ;multiday = 3; | 535 | prefix ="<-" ;multiday = 3; |
537 | } | 536 | } |
538 | } | 537 | } |
539 | 538 | ||
540 | } else { | 539 | } else { |
541 | if (mDate == event->dtStart().date()) { | 540 | if (mDate == event->dtStart().date()) { |
542 | prefix ="->" ;multiday = 1; | 541 | prefix ="->" ;multiday = 1; |
543 | } else if (mDate == event->dtEnd().date()) { | 542 | } else if (mDate == event->dtEnd().date()) { |