-rw-r--r-- | core/pim/datebook/datebookday.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index aaf3e16..a6a1be3 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp | |||
@@ -632,22 +632,17 @@ void DateBookDayWidget::setAllDayText( QString &text ) { | |||
632 | void DateBookDayWidget::setEventText( QString& text ) { | 632 | void DateBookDayWidget::setEventText( QString& text ) { |
633 | bool whichClock = dateBook->dayView()->whichClock(); | 633 | bool whichClock = dateBook->dayView()->whichClock(); |
634 | text += "<b>" + tr("Time") + "</b>: "; | 634 | if ( ev.startDate() != ev.endDate() ) { |
635 | if ( ev.startDate() != ev.date() ) { | 635 | text += "<b>" + tr("Start") + "</b>: "; |
636 | // multi-day event. Show start date | 636 | text += TimeString::timeString( ev.event().start().time(), whichClock, FALSE ); |
637 | text += TimeString::longDateString( ev.startDate() ); | 637 | text += " - " + TimeString::longDateString( ev.startDate() ) + "<br>"; |
638 | text += "<b>" + tr("End") + "</b>: "; | ||
639 | text += TimeString::timeString( ev.event().end().time(), whichClock, FALSE ); | ||
640 | text += " - " + TimeString::longDateString( ev.endDate() ) + "<br>"; | ||
638 | } else { | 641 | } else { |
639 | // Show start time. | 642 | text += "<b>" + tr("Time") + "</b>: "; |
640 | text += TimeString::timeString( ev.start(), whichClock, FALSE ); | 643 | text += TimeString::timeString( ev.start(), whichClock, FALSE ); |
641 | } | 644 | text += "<b>" + tr(" - ") + "</b>"; |
642 | |||
643 | text += "<b>" + tr(" - ") + "</b>"; | ||
644 | if ( ev.endDate() != ev.date() ) { | ||
645 | // multi-day event. Show end date | ||
646 | text += TimeString::longDateString( ev.endDate() ); | ||
647 | } else { | ||
648 | // Show end time. | ||
649 | text += TimeString::timeString( ev.end(), whichClock, FALSE ); | 645 | text += TimeString::timeString( ev.end(), whichClock, FALSE ); |
650 | } | 646 | } |
651 | |||
652 | } | 647 | } |
653 | 648 | ||