-rw-r--r-- | korganizer/koagendaview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index ef5c4dd..131a345 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -827,25 +827,28 @@ void KOAgendaView::createDayLabels() | |||
827 | QString addString; | 827 | QString addString; |
828 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) | 828 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) |
829 | addString = i18n("Today"); | 829 | addString = i18n("Today"); |
830 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) | 830 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) |
831 | addString = i18n("Tomorrow"); | 831 | addString = i18n("Tomorrow"); |
832 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) | 832 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) |
833 | addString = i18n("Yesterday"); | 833 | addString = i18n("Yesterday"); |
834 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) | 834 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) |
835 | addString = i18n("Day before yesterday"); | 835 | addString = i18n("Day before yesterday"); |
836 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) | 836 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) |
837 | addString = i18n("Day after tomorrow"); | 837 | addString = i18n("Day after tomorrow"); |
838 | if ( !addString.isEmpty() ) { | 838 | if ( !addString.isEmpty() ) { |
839 | str = addString+", " + str; | 839 | if ( QApplication::desktop()->width() < 640 ) |
840 | str = addString+", " + str; | ||
841 | else | ||
842 | str = addString+", "+ KGlobal::locale()->formatDate( date, false); | ||
840 | } else { | 843 | } else { |
841 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); | 844 | str = KGlobal::locale()->formatDate( date, KOPrefs::instance()->mShortDateInViewer); |
842 | } | 845 | } |
843 | } | 846 | } |
844 | dayLabel->setText(str); | 847 | dayLabel->setText(str); |
845 | //dayLabel->setAlignment(QLabel::AlignHCenter); | 848 | //dayLabel->setAlignment(QLabel::AlignHCenter); |
846 | if (date == QDate::currentDate()) { | 849 | if (date == QDate::currentDate()) { |
847 | QFont bFont = dlf; | 850 | QFont bFont = dlf; |
848 | bFont.setBold( true ); | 851 | bFont.setBold( true ); |
849 | dayLabel->setFont(bFont); | 852 | dayLabel->setFont(bFont); |
850 | } | 853 | } |
851 | //dayLayout->addWidget(dayLabel); | 854 | //dayLayout->addWidget(dayLabel); |