-rw-r--r-- | korganizer/koeventviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index e938e4e..1fcc977 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -474,60 +474,61 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
474 | else mText += a->email(); | 474 | else mText += a->email(); |
475 | mText += "</a>\n"; | 475 | mText += "</a>\n"; |
476 | #endif | 476 | #endif |
477 | 477 | ||
478 | 478 | ||
479 | if (!a->email().isEmpty()) { | 479 | if (!a->email().isEmpty()) { |
480 | if (iconPath) { | 480 | if (iconPath) { |
481 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; | 481 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; |
482 | mText += "<IMG src=\"" + iconPath + "\">"; | 482 | mText += "<IMG src=\"" + iconPath + "\">"; |
483 | mText += "</a>\n"; | 483 | mText += "</a>\n"; |
484 | } | 484 | } |
485 | } | 485 | } |
486 | if (a->status() != Attendee::NeedsAction ) | 486 | if (a->status() != Attendee::NeedsAction ) |
487 | mText +="[" + a->statusStr() + "] "; | 487 | mText +="[" + a->statusStr() + "] "; |
488 | if (a->role() == Attendee::Chair ) | 488 | if (a->role() == Attendee::Chair ) |
489 | mText +="(" + a->roleStr().left(1) + ".)"; | 489 | mText +="(" + a->roleStr().left(1) + ".)"; |
490 | } | 490 | } |
491 | mText.append("</li></ul>"); | 491 | mText.append("</li></ul>"); |
492 | } | 492 | } |
493 | 493 | ||
494 | } | 494 | } |
495 | void KOEventViewer::appendJournal(Journal *jour, int mode ) | 495 | void KOEventViewer::appendJournal(Journal *jour, int mode ) |
496 | { | 496 | { |
497 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 497 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
498 | if (mode == 0 ) | 498 | if (mode == 0 ) { |
499 | addTag("h2",i18n("Journal from: ")); | 499 | addTag("h2",i18n("Journal from: ")); |
500 | } | ||
500 | else { | 501 | else { |
501 | if ( mode == 1 ) { | 502 | if ( mode == 1 ) { |
502 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); | 503 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); |
503 | } else { | 504 | } else { |
504 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); | 505 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); |
505 | } | 506 | } |
506 | addTag("h3",i18n( "Last modified " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | ||
507 | } | 507 | } |
508 | topLevelWidget()->setCaption("Journal Viewer"); | 508 | topLevelWidget()->setCaption("Journal Viewer"); |
509 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); | 509 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); |
510 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | ||
510 | if (!jour->description().isEmpty()) { | 511 | if (!jour->description().isEmpty()) { |
511 | addTag("p",jour->description()); | 512 | addTag("p",jour->description()); |
512 | } | 513 | } |
513 | setText(mText); | 514 | setText(mText); |
514 | } | 515 | } |
515 | 516 | ||
516 | void KOEventViewer::formatReadOnly(Incidence *event) | 517 | void KOEventViewer::formatReadOnly(Incidence *event) |
517 | { | 518 | { |
518 | if (event->isReadOnly()) { | 519 | if (event->isReadOnly()) { |
519 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); | 520 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); |
520 | } | 521 | } |
521 | } | 522 | } |
522 | void KOEventViewer::setSyncMode( bool b ) | 523 | void KOEventViewer::setSyncMode( bool b ) |
523 | { | 524 | { |
524 | mSyncMode = b; | 525 | mSyncMode = b; |
525 | } | 526 | } |
526 | 527 | ||
527 | 528 | ||
528 | void KOEventViewer::setTodo(Todo *event, bool clearV ) | 529 | void KOEventViewer::setTodo(Todo *event, bool clearV ) |
529 | { | 530 | { |
530 | if ( clearV ) | 531 | if ( clearV ) |
531 | clearEvents(); | 532 | clearEvents(); |
532 | if ( mSyncMode ) { | 533 | if ( mSyncMode ) { |
533 | if ( clearV ) | 534 | if ( clearV ) |