-rw-r--r-- | korganizer/koagendaitem.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index b416115..407424d 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -575,20 +575,24 @@ void KOAgendaItem::computeText() | |||
575 | } | 575 | } |
576 | } else { | 576 | } else { |
577 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) | 577 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) |
578 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; | 578 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + " - " + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; |
579 | 579 | ||
580 | if ( mAllDay ) { | 580 | if ( mAllDay ) { |
581 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { | 581 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { |
582 | if ( mIncidence->doesRecur() ) { | 582 | int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() ); |
583 | mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")"; | 583 | mDisplayedText += " ("+QString::number( dur )+i18n(" days") +")" ; |
584 | } else { | 584 | |
585 | int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() ); | 585 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { |
586 | mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true) + " ("+QString::number( dur )+i18n(" days") +")" ; | 586 | if ( mIncidence->doesRecur() ) { |
587 | } | 587 | mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")"; |
588 | } | 588 | } else { |
589 | mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true); | ||
590 | } | ||
591 | } | ||
592 | } | ||
589 | } | 593 | } |
590 | } | 594 | } |
591 | if ( !mIncidence->location().isEmpty() ) { | 595 | if ( !mIncidence->location().isEmpty() ) { |
592 | if ( mAllDay ) | 596 | if ( mAllDay ) |
593 | mDisplayedText += " ("; | 597 | mDisplayedText += " ("; |
594 | else | 598 | else |