bter today

2 files changed, 21 insertions, 4 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index adbfd67..5bfe1c8 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -3,6 +3,10 @@ Info about the changes in new versions of KDE-Pim/Pi
 ********** VERSION 1.9.20 ************
 
 KO/Pi:
+Added for the "dislplay one day" agenda mode 
+info in the caption and in the day lables:
+Now it is displayed, if the selected day is from "day before yesterday"
+to "day after tomorrow".
 Made it possible to delete a Todo, which has sub-todos.
 Fixed two small problems in the todo view.
 Added missing German translation for filter edit and print dialog.
@@ -11,9 +15,6 @@ Made search dialog closeable by cancel key.
 Made it possible to select in the date picker the (ligt grey )
 dates of the prev./next month with the mouse.
 
-Added for the "dislplay one day" agenda mode info in the caption:
-Now it is displayed, if the selected day is from "day before yesterday"
-to "day after tomorrow".
 
 
 
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index c5acafd..6428757 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -638,6 +638,7 @@ void KOAgendaView::createDayLabels()
     dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) );
     dayLabel->show();
     DateList::ConstIterator dit;
+    bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
     for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
         QDate date = *dit;
         // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels);
@@ -682,7 +683,22 @@ void KOAgendaView::createDayLabels()
         default:
             break;
         }
-
+        if ( oneday ) {
+            QString addString;
+            if ( mSelectedDates.first() == QDateTime::currentDateTime().date() )
+                addString = i18n("Today");
+            else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) )
+                addString = i18n("Tomorrow");
+            else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) )
+                addString = i18n("Yesterday");
+            else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) )
+                addString = i18n("Day before yesterday");
+            else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) )
+                addString = i18n("Day after tomorrow");
+            if ( !addString.isEmpty() ) {
+                str = addString+", " + str;
+            }
+        }
         dayLabel->setText(str);
         dayLabel->setAlignment(QLabel::AlignHCenter);
         if (date == QDate::currentDate()) {