author | zautrix <zautrix> | 2007-06-06 13:14:20 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2007-06-06 13:14:20 (UTC) |
commit | 623b4d4abe87789dacd4c14de88a63b44ca352b7 (patch) (unidiff) | |
tree | a6bcc1b9359bf904e08b508576c2d2e958cde55c /korganizer/koeventviewer.cpp | |
parent | d5c53970b9e12bfe774d1fecd603080aded24e09 (diff) | |
download | kdepimpi-623b4d4abe87789dacd4c14de88a63b44ca352b7.zip kdepimpi-623b4d4abe87789dacd4c14de88a63b44ca352b7.tar.gz kdepimpi-623b4d4abe87789dacd4c14de88a63b44ca352b7.tar.bz2 |
display of next alarm of recurring events in event viewer fixed
Diffstat (limited to 'korganizer/koeventviewer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | korganizer/koeventviewer.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 607e549..92d2a80 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -391,16 +391,26 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
391 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); | 391 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); |
392 | 392 | ||
393 | } | 393 | } |
394 | 394 | ||
395 | 395 | ||
396 | if (event->isAlarmEnabled()) { | 396 | if (event->isAlarmEnabled()) { |
397 | Alarm *alarm =event->alarms().first() ; | 397 | Alarm *alarm =event->alarms().first() ; |
398 | QDateTime t = alarm->time(); | 398 | QDateTime t = alarm->time(); |
399 | |||
400 | if (event->doesRecur()) { | ||
401 | bool ok = false; | ||
402 | int offset = 0; | ||
403 | QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; | ||
404 | if ( ok ) { | ||
405 | t = next; | ||
406 | } | ||
407 | } | ||
408 | |||
399 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 409 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); |
400 | if(wideScreen ){ | 410 | if(wideScreen ){ |
401 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); | 411 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); |
402 | }else{ | 412 | }else{ |
403 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 413 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
404 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 414 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
405 | } | 415 | } |
406 | //addTag("p",s); | 416 | //addTag("p",s); |
@@ -513,17 +523,25 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
513 | mMailSubject += i18n(" at ") + event->location(); | 523 | mMailSubject += i18n(" at ") + event->location(); |
514 | } | 524 | } |
515 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 525 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
516 | .arg(QString::number(event->priority()))); | 526 | .arg(QString::number(event->priority()))); |
517 | 527 | ||
518 | if (event->isAlarmEnabled()) { | 528 | if (event->isAlarmEnabled()) { |
519 | Alarm *alarm =event->alarms().first() ; | 529 | Alarm *alarm =event->alarms().first() ; |
520 | QDateTime t = alarm->time(); | 530 | QDateTime t = alarm->time(); |
521 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | 531 | if (event->doesRecur()) { |
532 | bool ok = false; | ||
533 | int offset = 0; | ||
534 | QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ; | ||
535 | if ( ok ) { | ||
536 | t = next; | ||
537 | } | ||
538 | } | ||
539 | QString s =i18n("( %1 before )").arg( alarm->offsetText() ); | ||
522 | if ( wideScreen ) { | 540 | if ( wideScreen ) { |
523 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); | 541 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate )); |
524 | } else { | 542 | } else { |
525 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); | 543 | addTag("p",i18n("<b>Alarm on: ") + s +" </b>"); |
526 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); | 544 | addTag("p", KGlobal::locale()->formatDateTime( t, shortDate )); |
527 | } | 545 | } |
528 | if ( !(event->alarmEnabled() ) ) { | 546 | if ( !(event->alarmEnabled() ) ) { |
529 | addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>"); | 547 | addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>"); |