-rw-r--r-- | korganizer/koagendaview.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index c5acafd..6428757 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -629,24 +629,25 @@ void KOAgendaView::createDayLabels() | |||
629 | if ( !dayLabel ) { | 629 | if ( !dayLabel ) { |
630 | appendLabels = true; | 630 | appendLabels = true; |
631 | dayLabel = new QLabel(mDayLabels); | 631 | dayLabel = new QLabel(mDayLabels); |
632 | mDayLabelsList.append( dayLabel ); | 632 | mDayLabelsList.append( dayLabel ); |
633 | mLayoutDayLabels->addWidget(dayLabel); | 633 | mLayoutDayLabels->addWidget(dayLabel); |
634 | } | 634 | } |
635 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); | 635 | dayLabel->setFixedWidth( mTimeLabels->width()+2 ); |
636 | dayLabel->setFont( dlf ); | 636 | dayLabel->setFont( dlf ); |
637 | dayLabel->setAlignment(QLabel::AlignHCenter); | 637 | dayLabel->setAlignment(QLabel::AlignHCenter); |
638 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); | 638 | dayLabel->setText( KOGlobals::self()->calendarSystem()->monthName( mSelectedDates.first(), true ) ); |
639 | dayLabel->show(); | 639 | dayLabel->show(); |
640 | DateList::ConstIterator dit; | 640 | DateList::ConstIterator dit; |
641 | bool oneday = (mSelectedDates.first() == mSelectedDates.last() ); | ||
641 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 642 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
642 | QDate date = *dit; | 643 | QDate date = *dit; |
643 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); | 644 | // QBoxLayout *dayLayout = new QVBoxLayout(mLayoutDayLabels); |
644 | if ( ! appendLabels ) { | 645 | if ( ! appendLabels ) { |
645 | dayLabel = mDayLabelsList.next(); | 646 | dayLabel = mDayLabelsList.next(); |
646 | if ( !dayLabel ) | 647 | if ( !dayLabel ) |
647 | appendLabels = true; | 648 | appendLabels = true; |
648 | } | 649 | } |
649 | if ( appendLabels ) { | 650 | if ( appendLabels ) { |
650 | dayLabel = new QLabel(mDayLabels); | 651 | dayLabel = new QLabel(mDayLabels); |
651 | mDayLabelsList.append( dayLabel ); | 652 | mDayLabelsList.append( dayLabel ); |
652 | mLayoutDayLabels->addWidget(dayLabel); | 653 | mLayoutDayLabels->addWidget(dayLabel); |
@@ -673,25 +674,40 @@ void KOAgendaView::createDayLabels() | |||
673 | break; | 674 | break; |
674 | case 5: | 675 | case 5: |
675 | str = dayName.left( 2 ) + " " +QString::number( date.day()); | 676 | str = dayName.left( 2 ) + " " +QString::number( date.day()); |
676 | 677 | ||
677 | break; | 678 | break; |
678 | case 6: | 679 | case 6: |
679 | str = dayName.left( 3 ) + " " +QString::number( date.day()); | 680 | str = dayName.left( 3 ) + " " +QString::number( date.day()); |
680 | break; | 681 | break; |
681 | 682 | ||
682 | default: | 683 | default: |
683 | break; | 684 | break; |
684 | } | 685 | } |
685 | 686 | if ( oneday ) { | |
687 | QString addString; | ||
688 | if ( mSelectedDates.first() == QDateTime::currentDateTime().date() ) | ||
689 | addString = i18n("Today"); | ||
690 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(1) ) | ||
691 | addString = i18n("Tomorrow"); | ||
692 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-1) ) | ||
693 | addString = i18n("Yesterday"); | ||
694 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(-2) ) | ||
695 | addString = i18n("Day before yesterday"); | ||
696 | else if ( mSelectedDates.first() == QDateTime::currentDateTime().date().addDays(2) ) | ||
697 | addString = i18n("Day after tomorrow"); | ||
698 | if ( !addString.isEmpty() ) { | ||
699 | str = addString+", " + str; | ||
700 | } | ||
701 | } | ||
686 | dayLabel->setText(str); | 702 | dayLabel->setText(str); |
687 | dayLabel->setAlignment(QLabel::AlignHCenter); | 703 | dayLabel->setAlignment(QLabel::AlignHCenter); |
688 | if (date == QDate::currentDate()) { | 704 | if (date == QDate::currentDate()) { |
689 | QFont bFont = dlf; | 705 | QFont bFont = dlf; |
690 | bFont.setBold( true ); | 706 | bFont.setBold( true ); |
691 | dayLabel->setFont(bFont); | 707 | dayLabel->setFont(bFont); |
692 | } | 708 | } |
693 | //dayLayout->addWidget(dayLabel); | 709 | //dayLayout->addWidget(dayLabel); |
694 | 710 | ||
695 | #ifndef KORG_NOPLUGINS | 711 | #ifndef KORG_NOPLUGINS |
696 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); | 712 | CalendarDecoration::List cds = KOCore::self()->calendarDecorations(); |
697 | CalendarDecoration *it; | 713 | CalendarDecoration *it; |