summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-10-10 01:15:44 (UTC)
committer zautrix <zautrix>2005-10-10 01:15:44 (UTC)
commita36b62685510933d1fd57d2c53d50b7f2fe2fc1c (patch) (side-by-side diff)
treee97e078210104bdc70b9ed9d63f66e083cd0b032
parentb4ed5a3409d8a6d2f443e78306abbaf6963f0f9e (diff)
downloadkdepimpi-a36b62685510933d1fd57d2c53d50b7f2fe2fc1c.zip
kdepimpi-a36b62685510933d1fd57d2c53d50b7f2fe2fc1c.tar.gz
kdepimpi-a36b62685510933d1fd57d2c53d50b7f2fe2fc1c.tar.bz2
kkk
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkcal/kincidenceformatter.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index f8f40f1..4dfe16a 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -61,49 +61,51 @@ void KIncidenceFormatter::setEvent(Event *event)
if ( mColorMode == 2 ) {
mText +="<font color=\"#C00000\">";
}
// mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
if ( mode == 1 ) {
addTag("h2",i18n( "Local: " ) +deTag(event->summary()));
} else {
addTag("h2",i18n( "Remote: " ) +deTag(event->summary()));
}
formatReadOnly(event);
addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) );
if ( mColorMode )
mText += "</font>";
}
if (event->cancelled ()) {
mText +="<font color=\"#B00000\">";
addTag("i",i18n("This event has been cancelled!"));
mText.append("<br>");
mText += "</font>";
}
if (event->doesFloat()) {
if (event->isMultiDay()) {
mText.append(i18n("<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>")
.arg(event->dtStartDateStr(shortDate))
- .arg(event->dtEndDateStr(shortDate)));
+ .arg(event->dtEndDateStr(shortDate)));
+ mText.append(i18n("<p><b>Duration:</b> %1 days</p>")
+ .arg(event->dtStart().daysTo(event->dtEnd())+1));
} else {
mText.append(i18n("<p><b>On:</b> %1</p>").arg(event->dtStartDateStr( shortDate )));
}
} else {
if (event->isMultiDay()) {
mText.append(i18n("<p><b>From:</b> %1</p> ")
.arg(event->dtStartStr( shortDate)));
mText.append(i18n("<p><b>To:</b> %1</p>")
.arg(event->dtEndStr(shortDate)));
} else {
mText.append(i18n("<p><b>From:</b> %1 <b>To:</b> %2</p>")
.arg(event->dtStartTimeStr())
.arg(event->dtEndTimeStr()));
mText.append(i18n("<p><b>On:</b> %1</p> ")
.arg(event->dtStartDateStr( shortDate )));
}
}
if (!event->location().isEmpty()) {
addTag("b",i18n("Location: "));
mText.append(deTag(event->location())+"<br>");
}
if (event->doesRecur()) {