summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-23 15:44:48 (UTC)
committer zautrix <zautrix>2005-01-23 15:44:48 (UTC)
commitabe5f73892c123110faec5648b484628b3265fd6 (patch) (side-by-side diff)
tree8619e09ffbeb3b5ef9302a8bcb39092b426d3e43
parent6946f6ab0ee6eeafee0c8ff5d33fffc0826c7452 (diff)
downloadkdepimpi-abe5f73892c123110faec5648b484628b3265fd6.zip
kdepimpi-abe5f73892c123110faec5648b484628b3265fd6.tar.gz
kdepimpi-abe5f73892c123110faec5648b484628b3265fd6.tar.bz2
bter today
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt7
-rw-r--r--korganizer/koagendaview.cpp18
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
@@ -4,4 +4,8 @@ Info about the changes in new versions of KDE-Pim/Pi
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.
@@ -12,7 +16,4 @@ 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
@@ -639,4 +639,5 @@ void KOAgendaView::createDayLabels()
dayLabel->show();
DateList::ConstIterator dit;
+ bool oneday = (mSelectedDates.first() == mSelectedDates.last() );
for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) {
QDate date = *dit;
@@ -683,5 +684,20 @@ void KOAgendaView::createDayLabels()
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);