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 | |
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
-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 | |||
@@ -367,64 +367,74 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
367 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); | 367 | next = event->getNextOccurence( QDateTime::currentDateTime() , &ok ); |
368 | if ( ok ) { | 368 | if ( ok ) { |
369 | if ( wideScreen ){ | 369 | if ( wideScreen ){ |
370 | addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) ); | 370 | addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) ); |
371 | } else { | 371 | } else { |
372 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); | 372 | addTag("p",i18n("<b>Next recurrence is on:</b>") ); |
373 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); | 373 | addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate )); |
374 | } | 374 | } |
375 | mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true ); | 375 | mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true ); |
376 | 376 | ||
377 | } else { | 377 | } else { |
378 | bool last; | 378 | bool last; |
379 | QDate nextd; | 379 | QDate nextd; |
380 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); | 380 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); |
381 | if ( last ) { | 381 | if ( last ) { |
382 | if ( wideScreen ){ | 382 | if ( wideScreen ){ |
383 | addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate )); | 383 | addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate )); |
384 | } else{ | 384 | } else{ |
385 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); | 385 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); |
386 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); | 386 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); |
387 | } | 387 | } |
388 | } | 388 | } |
389 | } | 389 | } |
390 | } else { | 390 | } else { |
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); |
407 | if ( !(event->alarmEnabled() ) ) { | 417 | if ( !(event->alarmEnabled() ) ) { |
408 | addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>"); | 418 | addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>"); |
409 | 419 | ||
410 | } | 420 | } |
411 | } | 421 | } |
412 | 422 | ||
413 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); | 423 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); |
414 | 424 | ||
415 | formatCategories(event); | 425 | formatCategories(event); |
416 | 426 | ||
417 | formatAttendees(event); | 427 | formatAttendees(event); |
418 | 428 | ||
419 | if ( KOPrefs::instance()->mEVshowCreated ) { | 429 | if ( KOPrefs::instance()->mEVshowCreated ) { |
420 | if(wideScreen ){ | 430 | if(wideScreen ){ |
421 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 431 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
422 | }else{ | 432 | }else{ |
423 | addTag("p",i18n("<b>Created: ") +" </b>"); | 433 | addTag("p",i18n("<b>Created: ") +" </b>"); |
424 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 434 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
425 | } | 435 | } |
426 | 436 | ||
427 | 437 | ||
428 | } | 438 | } |
429 | if ( KOPrefs::instance()->mEVshowChanged ) { | 439 | if ( KOPrefs::instance()->mEVshowChanged ) { |
430 | if(wideScreen ){ | 440 | if(wideScreen ){ |
@@ -489,65 +499,73 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
489 | mText +="<font color=\"#B00000\">"; | 499 | mText +="<font color=\"#B00000\">"; |
490 | addTag("i",i18n("This todo has been cancelled!")); | 500 | addTag("i",i18n("This todo has been cancelled!")); |
491 | mText.append("<br>"); | 501 | mText.append("<br>"); |
492 | mText += "</font>"; | 502 | mText += "</font>"; |
493 | mMailSubject += i18n("(cancelled)"); | 503 | mMailSubject += i18n("(cancelled)"); |
494 | } | 504 | } |
495 | 505 | ||
496 | 506 | ||
497 | 507 | ||
498 | if (event->doesRecur()) { | 508 | if (event->doesRecur()) { |
499 | 509 | ||
500 | QString recurText = event->recurrence()->recurrenceText(); | 510 | QString recurText = event->recurrence()->recurrenceText(); |
501 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | 511 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); |
502 | 512 | ||
503 | } | 513 | } |
504 | if (event->hasStartDate()) { | 514 | if (event->hasStartDate()) { |
505 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 515 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
506 | } | 516 | } |
507 | if (event->hasDueDate()) { | 517 | if (event->hasDueDate()) { |
508 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); | 518 | mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer))); |
509 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); | 519 | mMailSubject += i18n(" - " )+event->dtDueStr( true ); |
510 | } | 520 | } |
511 | if (!event->location().isEmpty()) { | 521 | if (!event->location().isEmpty()) { |
512 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); | 522 | addTag("p","<b>"+i18n("Location: ")+"</b>"+ deTag(event->location() ) ); |
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>"); |
530 | 548 | ||
531 | } | 549 | } |
532 | } | 550 | } |
533 | 551 | ||
534 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); | 552 | addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr()); |
535 | 553 | ||
536 | formatCategories(event); | 554 | formatCategories(event); |
537 | 555 | ||
538 | formatAttendees(event); | 556 | formatAttendees(event); |
539 | 557 | ||
540 | if ( KOPrefs::instance()->mEVshowCreated ) { | 558 | if ( KOPrefs::instance()->mEVshowCreated ) { |
541 | if(wideScreen ){ | 559 | if(wideScreen ){ |
542 | 560 | ||
543 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 561 | addTag("p",i18n("<b>Created: ") +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
544 | 562 | ||
545 | } else { | 563 | } else { |
546 | addTag("p",i18n("<b>Created: ") +" </b>"); | 564 | addTag("p",i18n("<b>Created: ") +" </b>"); |
547 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); | 565 | addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate )); |
548 | } | 566 | } |
549 | } | 567 | } |
550 | if ( KOPrefs::instance()->mEVshowChanged ) { | 568 | if ( KOPrefs::instance()->mEVshowChanged ) { |
551 | if(wideScreen ){ | 569 | if(wideScreen ){ |
552 | addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); | 570 | addTag("p",i18n("<b>Last modified: ") +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) ); |
553 | 571 | ||