-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 | |||
@@ -357,34 +357,33 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
357 | QDate nextd; | 357 | QDate nextd; |
358 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); | 358 | nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last ); |
359 | if ( last ) { | 359 | if ( last ) { |
360 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); | 360 | addTag("p",i18n("<b>Last recurrence was on:</b>") ); |
361 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); | 361 | addTag("p", KGlobal::locale()->formatDate( nextd, shortDate )); |
362 | } | 362 | } |
363 | } | 363 | } |
364 | } else { | 364 | } else { |
365 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); | 365 | mMailSubject += i18n(" - " )+event->dtStartStr( true ); |
366 | 366 | ||
367 | } | 367 | } |
368 | 368 | ||
369 | 369 | ||
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); |
378 | } | 377 | } |
379 | 378 | ||
380 | addTag("b",i18n("Access: ")); | 379 | addTag("b",i18n("Access: ")); |
381 | mText.append(event->secrecyStr()+"<br>"); | 380 | mText.append(event->secrecyStr()+"<br>"); |
382 | 381 | ||
383 | 382 | ||
384 | if ( KOPrefs::instance()->mEVshowDetails ) { | 383 | if ( KOPrefs::instance()->mEVshowDetails ) { |
385 | if (!event->description().isEmpty()) { | 384 | if (!event->description().isEmpty()) { |
386 | addTag("p",i18n("<b>Details: </b>")); | 385 | addTag("p",i18n("<b>Details: </b>")); |
387 | addTag("p",deTag(event->description())); | 386 | addTag("p",deTag(event->description())); |
388 | } | 387 | } |
389 | } | 388 | } |
390 | formatCategories(event); | 389 | formatCategories(event); |
@@ -456,32 +455,43 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
456 | mMailSubject += i18n(" at ") + event->location(); | 455 | mMailSubject += i18n(" at ") + event->location(); |
457 | } | 456 | } |
458 | 457 | ||
459 | if (event->recurrence()->doesRecur()) { | 458 | if (event->recurrence()->doesRecur()) { |
460 | 459 | ||
461 | QString recurText = event->recurrence()->recurrenceText(); | 460 | QString recurText = event->recurrence()->recurrenceText(); |
462 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); | 461 | addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>"); |
463 | 462 | ||
464 | } | 463 | } |
465 | if (event->hasStartDate()) { | 464 | if (event->hasStartDate()) { |
466 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); | 465 | mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer))); |
467 | } | 466 | } |
468 | if (event->hasDueDate()) { | 467 | if (event->hasDueDate()) { |
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 ) { |
475 | if (!event->description().isEmpty()) { | 485 | if (!event->description().isEmpty()) { |
476 | addTag("p",i18n("<b>Details: </b>")); | 486 | addTag("p",i18n("<b>Details: </b>")); |
477 | addTag("p",deTag(event->description())); | 487 | addTag("p",deTag(event->description())); |
478 | } | 488 | } |
479 | } | 489 | } |
480 | 490 | ||
481 | formatCategories(event); | 491 | formatCategories(event); |
482 | 492 | ||
483 | mText.append(i18n("<p><b>Priority:</b> %2</p>") | 493 | mText.append(i18n("<p><b>Priority:</b> %2</p>") |
484 | .arg(QString::number(event->priority()))); | 494 | .arg(QString::number(event->priority()))); |
485 | 495 | ||
486 | formatReadOnly(event); | 496 | formatReadOnly(event); |
487 | formatAttendees(event); | 497 | formatAttendees(event); |