author | zautrix <zautrix> | 2005-04-02 14:07:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-02 14:07:31 (UTC) |
commit | b0d17f8f2ef9b09b7d8b8aa0f6cc34f400f8fddd (patch) (unidiff) | |
tree | 942bcf89b35cf165e9147c1e4a5efa817c48007f /korganizer/koeventviewer.cpp | |
parent | 997e7660a81baa2b8aeb1b66a3cc3ebe54e00ebe (diff) | |
download | kdepimpi-b0d17f8f2ef9b09b7d8b8aa0f6cc34f400f8fddd.zip kdepimpi-b0d17f8f2ef9b09b7d8b8aa0f6cc34f400f8fddd.tar.gz kdepimpi-b0d17f8f2ef9b09b7d8b8aa0f6cc34f400f8fddd.tar.bz2 |
fixes
Diffstat (limited to 'korganizer/koeventviewer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koeventviewer.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index dbe0668..bdad248 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -370,8 +370,7 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
370 | if (event->isAlarmEnabled()) { | 370 | if (event->isAlarmEnabled()) { |
371 | Alarm *alarm =event->alarms().first() ; | 371 | Alarm *alarm =event->alarms().first() ; |
372 | QDateTime t = alarm->time(); | 372 | QDateTime t = alarm->time(); |
373 | int min = t.secsTo( event->dtStart() )/60; | 373 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
374 | QString s =i18n("( %1 min before )").arg( min ); | ||
375 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 374 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
376 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 375 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
377 | //addTag("p",s); | 376 | //addTag("p",s); |
@@ -469,6 +468,17 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
469 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 468 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
470 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 469 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
471 | } | 470 | } |
471 | |||
472 | |||
473 | if (event->isAlarmEnabled()) { | ||
474 | Alarm *alarm =event->alarms().first() ; | ||
475 | QDateTime t = alarm->time(); | ||
476 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | ||
477 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | ||
478 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | ||
479 | //addTag("p",s); | ||
480 | } | ||
481 | |||
472 | addTag("b",i18n("Access: ")); | 482 | addTag("b",i18n("Access: ")); |
473 | mText.append(event->secrecyStr()+"<br>"); | 483 | mText.append(event->secrecyStr()+"<br>"); |
474 | if ( KOPrefs::instance()->mEVshowDetails ) { | 484 | if ( KOPrefs::instance()->mEVshowDetails ) { |