summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-24 20:42:26 (UTC)
committer zautrix <zautrix>2005-10-24 20:42:26 (UTC)
commitf696b904526567d45cd01a5b607644f8aa3bfe6b (patch) (unidiff)
tree938cad6f52461b54969da1933cae232c5c4da6f5
parent9b626f37040b4da2a23cdce2d9241218b84d3d88 (diff)
downloadkdepimpi-f696b904526567d45cd01a5b607644f8aa3bfe6b.zip
kdepimpi-f696b904526567d45cd01a5b607644f8aa3bfe6b.tar.gz
kdepimpi-f696b904526567d45cd01a5b607644f8aa3bfe6b.tar.bz2
fixx
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagendaitem.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index b416115..407424d 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -578,12 +578,16 @@ void KOAgendaItem::computeText()
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 ( (static_cast<Event*>(mIncidence))->isMultiDay() ) {
582 int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() );
583 mDisplayedText += " ("+QString::number( dur )+i18n(" days") +")" ;
584
581 if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { 585 if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) {
582 if ( mIncidence->doesRecur() ) { 586 if ( mIncidence->doesRecur() ) {
583 mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")"; 587 mDisplayedText += " (" + mIncidence->recurrence()->recurrenceText() + ")";
584 } else { 588 } else {
585 int dur = 1+ (static_cast<Event*>(mIncidence))->dtStart().date().daysTo( (static_cast<Event*>(mIncidence))->dtEnd().date() ); 589 mDisplayedText += ": " +KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtStart().date(), true) + " - " + KGlobal::locale()->formatDate((static_cast<Event*>(mIncidence))->dtEnd().date(), true);
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") +")" ; 590 }
587 } 591 }
588 } 592 }
589 } 593 }