-rw-r--r-- | korganizer/koeventviewer.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index dcbb99f..8c1e5b2 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -691,36 +691,42 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) | |||
691 | if (mode == 0 ) { | 691 | if (mode == 0 ) { |
692 | addTag("h2",i18n("Journal from: ")); | 692 | addTag("h2",i18n("Journal from: ")); |
693 | } | 693 | } |
694 | else { | 694 | else { |
695 | if ( mode == 1 ) { | 695 | if ( mode == 1 ) { |
696 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); | 696 | addTag("h2",i18n( "Local: " ) +i18n("Journal from: ")); |
697 | } else { | 697 | } else { |
698 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); | 698 | addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); |
699 | } | 699 | } |
700 | } | 700 | } |
701 | topLevelWidget()->setCaption("Journal Viewer"); | 701 | topLevelWidget()->setCaption("Journal Viewer"); |
702 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); | 702 | mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); |
703 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | ||
704 | if (!jour->summary().isEmpty()) { | 703 | if (!jour->summary().isEmpty()) { |
705 | addTag("p",i18n(" Title: ") + deTag(jour->summary())); | 704 | addTag("b",i18n(" Title: ") + deTag(jour->summary())); |
706 | } | 705 | } |
706 | formatReadOnly(jour); | ||
707 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | ||
708 | |||
707 | if (!jour->description().isEmpty()) { | 709 | if (!jour->description().isEmpty()) { |
708 | addTag("p",deTag(jour->description())); | 710 | addTag("p",deTag(jour->description())); |
709 | } | 711 | } |
710 | setText(mText); | 712 | setText(mText); |
711 | } | 713 | } |
712 | 714 | ||
713 | void KOEventViewer::formatReadOnly(Incidence *event) | 715 | void KOEventViewer::formatReadOnly(Incidence *event) |
714 | { | 716 | { |
717 | int id = event->calID(); | ||
718 | if ( id > 1 ) { | ||
719 | addTag("p", i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName ); | ||
720 | } | ||
715 | if (event->isReadOnly()) { | 721 | if (event->isReadOnly()) { |
716 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); | 722 | addTag("p","<em>(" + i18n("read-only") + ")</em>"); |
717 | } | 723 | } |
718 | } | 724 | } |
719 | void KOEventViewer::setSyncMode( bool b ) | 725 | void KOEventViewer::setSyncMode( bool b ) |
720 | { | 726 | { |
721 | mSyncMode = b; | 727 | mSyncMode = b; |
722 | } | 728 | } |
723 | 729 | ||
724 | void KOEventViewer::setTodo(Todo *event, bool clearV ) | 730 | void KOEventViewer::setTodo(Todo *event, bool clearV ) |
725 | { | 731 | { |
726 | if ( clearV ) | 732 | if ( clearV ) |