Diffstat (limited to 'korganizer/kowhatsnextview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 221debc..fafcb58 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -520,24 +520,26 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
520 | else { | 520 | else { |
521 | st = event->dtStart(); | 521 | st = event->dtStart(); |
522 | end = event->dtEnd(); | 522 | end = event->dtEnd(); |
523 | } | 523 | } |
524 | 524 | ||
525 | 525 | ||
526 | QString dateText; | 526 | QString dateText; |
527 | // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); | 527 | // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); |
528 | if ( st.date() < mEventDate ) | 528 | if ( st.date() < mEventDate ) |
529 | dateText = "++:++-"; | 529 | dateText = "++:++-"; |
530 | else | 530 | else |
531 | dateText = event->dtStartTimeStr() + "-"; | 531 | dateText = event->dtStartTimeStr() + "-"; |
532 | if ( KOPrefs::instance()->mWhatsNextTime2Lines ) | ||
533 | dateText += " "; | ||
532 | if ( end.date() > mEventDate ) | 534 | if ( end.date() > mEventDate ) |
533 | dateText += "++:++"; | 535 | dateText += "++:++"; |
534 | else | 536 | else |
535 | dateText += event->dtEndTimeStr(); | 537 | dateText += event->dtEndTimeStr(); |
536 | if ( notRed ) | 538 | if ( notRed ) |
537 | tempText += dateText; | 539 | tempText += dateText; |
538 | else { | 540 | else { |
539 | if ( end < cdt ) { | 541 | if ( end < cdt ) { |
540 | if ( !KOPrefs::instance()->mWNViewShowsPast ) | 542 | if ( !KOPrefs::instance()->mWNViewShowsPast ) |
541 | return false; | 543 | return false; |
542 | tempText += "<font color=\"#F00000\">" + dateText + "</font>"; | 544 | tempText += "<font color=\"#F00000\">" + dateText + "</font>"; |
543 | } | 545 | } |
@@ -547,32 +549,44 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
547 | tempText += dateText; | 549 | tempText += dateText; |
548 | 550 | ||
549 | } | 551 | } |
550 | 552 | ||
551 | } else { | 553 | } else { |
552 | if ( bDay ) { | 554 | if ( bDay ) { |
553 | 555 | ||
554 | if ( ev->isBirthday()) | 556 | if ( ev->isBirthday()) |
555 | tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>"; | 557 | tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>"; |
556 | else | 558 | else |
557 | tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>"; | 559 | tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>"; |
558 | } else { | 560 | } else { |
559 | tempText += i18n("Allday:"); | 561 | if ( ((Event*)ev)->isMultiDay() ) { |
562 | QString dfs = KGlobal::locale()->dateFormatShort(); | ||
563 | KGlobal::locale()->setDateFormatShort("%d.%b"); | ||
564 | tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtStart().date(), true, KLocale::Userdefined) + "-"; | ||
565 | if ( KOPrefs::instance()->mWhatsNextTime2Lines ) | ||
566 | tempText += " "; | ||
567 | tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtEnd().date(), true, KLocale::Userdefined); | ||
568 | KGlobal::locale()->setDateFormatShort(dfs); | ||
569 | } else { | ||
570 | tempText += " " ;//i18n("Allday:"); | ||
571 | } | ||
560 | } | 572 | } |
561 | 573 | ||
562 | } | 574 | } |
563 | } | 575 | } |
564 | } else { | 576 | } else { |
565 | mTodos.append( ev ); | 577 | mTodos.append( ev ); |
566 | tempText += i18n("ToDo:"); | 578 | tempText += i18n("ToDo:"); |
579 | if ( KOPrefs::instance()->mWhatsNextTime2Lines ) | ||
580 | tempText += " "; | ||
567 | if (reply) { | 581 | if (reply) { |
568 | tempText += " "; | 582 | tempText += " "; |
569 | if ( noc != cdt ) { | 583 | if ( noc != cdt ) { |
570 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 584 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
571 | } | 585 | } |
572 | } else { | 586 | } else { |
573 | if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { | 587 | if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { |
574 | // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; | 588 | // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; |
575 | QString dfs = KGlobal::locale()->dateFormatShort(); | 589 | QString dfs = KGlobal::locale()->dateFormatShort(); |
576 | KGlobal::locale()->setDateFormatShort("%d.%b"); | 590 | KGlobal::locale()->setDateFormatShort("%d.%b"); |
577 | tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; | 591 | tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; |
578 | KGlobal::locale()->setDateFormatShort(dfs); | 592 | KGlobal::locale()->setDateFormatShort(dfs); |