Diffstat (limited to 'libkcal/kincidenceformatter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libkcal/kincidenceformatter.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp index 4dfe16a..733b897 100644 --- a/libkcal/kincidenceformatter.cpp +++ b/libkcal/kincidenceformatter.cpp | |||
@@ -136,4 +136,12 @@ void KIncidenceFormatter::setEvent(Event *event) | |||
136 | Alarm *alarm =event->alarms().first() ; | 136 | Alarm *alarm =event->alarms().first() ; |
137 | QDateTime t = alarm->time(); | 137 | QDateTime t = alarm->time(); |
138 | if (event->doesRecur()) { | ||
139 | bool ok = false; | ||
140 | int offset = 0; | ||
141 | QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; | ||
142 | if ( ok ) { | ||
143 | t = next; | ||
144 | } | ||
145 | } | ||
138 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 146 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
139 | addTag("p",i18n("<b>Alarm on: </b>") + s + ": "+KGlobal::locale()->formatDateTime( t, shortDate )); | 147 | addTag("p",i18n("<b>Alarm on: </b>") + s + ": "+KGlobal::locale()->formatDateTime( t, shortDate )); |
@@ -245,4 +253,12 @@ void KIncidenceFormatter::setTodo(Todo *event ) | |||
245 | Alarm *alarm =event->alarms().first() ; | 253 | Alarm *alarm =event->alarms().first() ; |
246 | QDateTime t = alarm->time(); | 254 | QDateTime t = alarm->time(); |
255 | if (event->doesRecur()) { | ||
256 | bool ok = false; | ||
257 | int offset = 0; | ||
258 | QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; | ||
259 | if ( ok ) { | ||
260 | t = next; | ||
261 | } | ||
262 | } | ||
247 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 263 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
248 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 264 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |