-rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
-rw-r--r-- | korganizer/koprefs.h | 1 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 6 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 16 |
4 files changed, 22 insertions, 2 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 6560877..eb997f5 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -119,2 +119,3 @@ KOPrefs::KOPrefs() : addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false ); + addItemBool("WhatsNextTime2Lines",&mWhatsNextTime2Lines, false ); addItemInt("Whats Next Days",&mWhatsNextDays,3); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 2ff03fa..9749ba3 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -210,2 +210,3 @@ class KOPrefs : public KPimPrefs int mWhatsNextDays; + bool mWhatsNextTime2Lines; int mWhatsNextPrios; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 05bd73f..9e2378a 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -781,5 +781,9 @@ void KOPrefsDialog::setupViewsTab() mPrioSpin->setFixedWidth( 40 ); - KPrefsDialogWidBool *passwdk = + addWidBool(i18n("Show times on two lines"), + &(KOPrefs::instance()->mWhatsNextTime2Lines),topFrame); + topLayout->addWidget(passwdk->checkBox(), ii++,0); + passwdk = + addWidBool(i18n("Show events that are done"), diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 221debc..fafcb58 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -531,2 +531,4 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a dateText = event->dtStartTimeStr() + "-"; + if ( KOPrefs::instance()->mWhatsNextTime2Lines ) + dateText += " "; if ( end.date() > mEventDate ) @@ -558,3 +560,13 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a } else { - tempText += i18n("Allday:"); + if ( ((Event*)ev)->isMultiDay() ) { + QString dfs = KGlobal::locale()->dateFormatShort(); + KGlobal::locale()->setDateFormatShort("%d.%b"); + tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtStart().date(), true, KLocale::Userdefined) + "-"; + if ( KOPrefs::instance()->mWhatsNextTime2Lines ) + tempText += " "; + tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtEnd().date(), true, KLocale::Userdefined); + KGlobal::locale()->setDateFormatShort(dfs); + } else { + tempText += " " ;//i18n("Allday:"); + } } @@ -566,2 +578,4 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a tempText += i18n("ToDo:"); + if ( KOPrefs::instance()->mWhatsNextTime2Lines ) + tempText += " "; if (reply) { |