fixxx

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
@@ -112,16 +112,17 @@ KOPrefs::KOPrefs() :
   addItemBool("ToolBarUp",&mToolBarUp, false );
   addItemBool("ToolBarHorV",&mToolBarHorV, true );
   addItemBool("ToolBarUpV",&mToolBarUpV, false );
   addItemBool("ToolBarHorN",&mToolBarHorN, true );
   addItemBool("ToolBarUpN",&mToolBarUpN, false );
   addItemBool("ToolBarHorF",&mToolBarHorF, true );
   addItemBool("ToolBarUpF",&mToolBarUpF, false );
   addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
+  addItemBool("WhatsNextTime2Lines",&mWhatsNextTime2Lines, false );
   addItemInt("Whats Next Days",&mWhatsNextDays,3);
   addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
 
   addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
   addItemBool("ShowCompletedTodoInAgenda",&mShowCompletedTodoInAgenda,true);
   addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
   addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
   addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 2ff03fa..9749ba3 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -203,16 +203,17 @@ class KOPrefs : public KPimPrefs
     bool    mEnableMonthScroll;
     bool    mFullViewMonth;
     bool    mMonthViewUsesCategoryColor;
     bool    mFullViewTodo;
     bool    mShowCompletedTodo;
     bool    mMarcusBainsEnabled;
     int     mNextXDays;
     int     mWhatsNextDays;
+    bool    mWhatsNextTime2Lines;
     int     mWhatsNextPrios;
     bool    mEnableQuickTodo;
 
     bool    mCompactDialogs;
     bool    mVerticalScreen;
 
     bool mShowIconNewTodo;
     bool mShowIconNewEvent;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 05bd73f..9e2378a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -774,19 +774,23 @@ void KOPrefsDialog::setupViewsTab()
   QHBox *prioBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addWidget(prioBox,ii++,0);
  
   QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
   mPrioSpin = new QSpinBox(0,5,1,prioBox);
   if ( QApplication::desktop()->width() <  300 )
       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"),
                  &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
       addWidBool(i18n("Show parent To-Do's"),
                  &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 221debc..fafcb58 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -524,16 +524,18 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
       
            
                 QString dateText;
                 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() );
                 if ( st.date() < mEventDate )
                     dateText = "++:++-";
                 else
                     dateText =  event->dtStartTimeStr() + "-";
+                if ( KOPrefs::instance()->mWhatsNextTime2Lines )
+                    dateText += " "; 
                 if ( end.date() > mEventDate ) 
                     dateText += "++:++";
                 else
                     dateText += event->dtEndTimeStr();
                 if ( notRed ) 
                     tempText += dateText;
                 else {
                     if ( end < cdt  ) {
@@ -551,24 +553,36 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
             } else {
                 if ( bDay ) {
                     
                     if ( ev->isBirthday())
                         tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>";
                     else
                         tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>";
                 } 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:");
+                    }
                 }
 
             }
         }
     } else {
         mTodos.append( ev );
         tempText += i18n("ToDo:"); 
+        if ( KOPrefs::instance()->mWhatsNextTime2Lines )
+            tempText += " "; 
         if (reply)  {
             tempText += " "; 
             if ( noc != cdt ) {
                 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
             }
         } else {
             if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
                 // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";