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
@@ -508,83 +508,97 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
                 Event *event = static_cast<Event *>(ev);
                 QDateTime st,end;
                 if ( event->recurrence()->doesRecur() ) {
                     QDate  recDate= mEventDate;
                     int days =  event->dtStart().date().daysTo (event->dtEnd().date()  );
                     while ( ! event->recursOn(  recDate ) ) {
                         recDate = recDate.addDays( -1 );
 
                     }
                     st =  QDateTime ( recDate,  event->dtStart().time() );
                     end = QDateTime ( recDate.addDays( days ),  event->dtEnd().time() );
                 }
                 else {
                     st = event->dtStart();
                     end = event->dtEnd();
                 }
       
            
                 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  ) {
                         if ( !KOPrefs::instance()->mWNViewShowsPast )
                             return false;
                         tempText += "<font color=\"#F00000\">" + dateText + "</font>";
                     }
                     else if ( st < cdt )
                         tempText += "<font color=\"#008000\">" + dateText + "</font>";
                     else
                         tempText += dateText;
                 
                 }
     
             } 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>";
                 QString dfs = KGlobal::locale()->dateFormatShort();
                 KGlobal::locale()->setDateFormatShort("%d.%b");
                 tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
                 KGlobal::locale()->setDateFormatShort(dfs);
             } else {
                 if (!ev->doesFloat() )
                     if( ( (Todo*)ev)->dtDue()  < cdt  ) {
                         tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
 
 
                     } else 
                         tempText +=((Todo*)ev)->dtDueTimeStr();
                 mTodos.append( ev );
             }
         }
     }