-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 | |||
@@ -470,98 +470,97 @@ void MonthViewCell::keyPressEvent ( QKeyEvent * e ) | |||
470 | 470 | ||
471 | void MonthViewCell::startUpdateCell() | 471 | void MonthViewCell::startUpdateCell() |
472 | { | 472 | { |
473 | 473 | ||
474 | mItemList->setFocusPolicy(NoFocus); | 474 | mItemList->setFocusPolicy(NoFocus); |
475 | if ( !mMonthView->isUpdatePossible() ) | 475 | if ( !mMonthView->isUpdatePossible() ) |
476 | return; | 476 | return; |
477 | 477 | ||
478 | /* | 478 | /* |
479 | if ( !isVisible() ){ | 479 | if ( !isVisible() ){ |
480 | return; | 480 | return; |
481 | } | 481 | } |
482 | */ | 482 | */ |
483 | // qDebug("MonthViewCell::updateCell() "); | 483 | // qDebug("MonthViewCell::updateCell() "); |
484 | setPrimary( mDate.month()%2 ); | 484 | setPrimary( mDate.month()%2 ); |
485 | setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); | 485 | setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays); |
486 | if ( mDate == QDate::currentDate() ) { | 486 | if ( mDate == QDate::currentDate() ) { |
487 | mItemList->setLineWidth( 3 ); | 487 | mItemList->setLineWidth( 3 ); |
488 | } else { | 488 | } else { |
489 | mItemList->setLineWidth( 1 ); | 489 | mItemList->setLineWidth( 1 ); |
490 | } | 490 | } |
491 | mItemList->clear(); | 491 | mItemList->clear(); |
492 | 492 | ||
493 | #ifdef DESKTOP_VERSION | 493 | #ifdef DESKTOP_VERSION |
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()) { |
544 | prefix ="<-" ;multiday = 3; | 543 | prefix ="<-" ;multiday = 3; |
545 | } | 544 | } |
546 | } | 545 | } |
547 | if ( !event->doesFloat() ) { | 546 | if ( !event->doesFloat() ) { |
548 | if ( mDate == event->dtStart().date () ) | 547 | if ( mDate == event->dtStart().date () ) |
549 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; | 548 | time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; |
550 | else if ( mDate == event->dtEnd().date () ) | 549 | else if ( mDate == event->dtEnd().date () ) |
551 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; | 550 | time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; |
552 | 551 | ||
553 | } | 552 | } |
554 | text = time + event->summary(); | 553 | text = time + event->summary(); |
555 | mToolTipText += prefix + text; | 554 | mToolTipText += prefix + text; |
556 | } else { | 555 | } else { |
557 | if (event->doesFloat()) { | 556 | if (event->doesFloat()) { |
558 | text = event->summary(); | 557 | text = event->summary(); |
559 | mToolTipText += text; | 558 | mToolTipText += text; |
560 | } | 559 | } |
561 | else { | 560 | else { |
562 | text = KGlobal::locale()->formatTime(event->dtStart().time()); | 561 | text = KGlobal::locale()->formatTime(event->dtStart().time()); |
563 | text += " " + event->summary(); | 562 | text += " " + event->summary(); |
564 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 563 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
565 | } | 564 | } |
566 | } | 565 | } |
567 | 566 | ||