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 | |||
@@ -529,6 +529,8 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
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 |
@@ -556,7 +558,17 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
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 | } |
@@ -564,6 +576,8 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
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 ) { |