-rw-r--r-- | korganizer/journalentry.cpp | 7 | ||||
-rw-r--r-- | korganizer/koeventviewer.cpp | 12 |
2 files changed, 15 insertions, 4 deletions
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 05bfd31..232ea58 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp | |||
@@ -191,10 +191,15 @@ void JournalEntry::setJournal(Journal *journal) | |||
191 | { | 191 | { |
192 | writeJournal(); | 192 | writeJournal(); |
193 | 193 | ||
194 | mJournal = journal; | 194 | mJournal = journal; |
195 | mTitle->setText(mJournal->summary()); | 195 | if ( journal->isReadOnly() ) |
196 | mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")"); | ||
197 | else | ||
198 | mTitle->setText(mJournal->summary()); | ||
196 | mEditor->setText(mJournal->description()); | 199 | mEditor->setText(mJournal->description()); |
200 | mTitle->setReadOnly (journal->isReadOnly() ); | ||
201 | mEditor->setReadOnly ( journal->isReadOnly() ); | ||
197 | int id = mJournal->calID(); | 202 | int id = mJournal->calID(); |
198 | 203 | ||
199 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; | 204 | QString calname = KOPrefs::instance()->getCalendar( id )->mName; |
200 | mTitleLabel->setText( " (" + calname +")"); | 205 | mTitleLabel->setText( " (" + calname +")"); |
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index dcbb99f..8c1e5b2 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -698,21 +698,27 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) | |||
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 | } |