-rw-r--r-- | korganizer/koagendaitem.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 39355b4..ee9f39a 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -466,19 +466,18 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) | |||
466 | } | 466 | } |
467 | void KOAgendaItem::computeText() | 467 | void KOAgendaItem::computeText() |
468 | { | 468 | { |
469 | 469 | ||
470 | mDisplayedText = mIncidence->summary(); | 470 | mDisplayedText = mIncidence->summary(); |
471 | if ( (mIncidence->type() == "Todo") ) { | 471 | if ( (mIncidence->type() == "Todo") ) { |
472 | if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { | ||
472 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) | 473 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) |
473 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; | 474 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; |
474 | else if ( !(mIncidence->doesFloat())) | 475 | else if ( !(mIncidence->doesFloat())) |
475 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; | 476 | mDisplayedText += i18n(" (") +KGlobal::locale()->formatTime((static_cast<Todo*>(mIncidence))->dtDue().time())+")"; |
476 | 477 | } | |
477 | |||
478 | |||
479 | } else { | 478 | } else { |
480 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) | 479 | if ( !(mIncidence->doesFloat()) && KOPrefs::instance()->mShowTimeInAgenda) |
481 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; | 480 | mDisplayedText += ": " +KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtStart().time()) + "-" + KGlobal::locale()->formatTime((static_cast<Event*>(mIncidence))->dtEnd().time()) ; |
482 | 481 | ||
483 | if ( mAllDay ) { | 482 | if ( mAllDay ) { |
484 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { | 483 | if ( mIncidence->dtStart().date().addDays(3) < mIncidence->dtEnd().date() ) { |