| -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) { writeJournal(); mJournal = journal; - mTitle->setText(mJournal->summary()); + if ( journal->isReadOnly() ) + mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")"); + else + mTitle->setText(mJournal->summary()); mEditor->setText(mJournal->description()); + mTitle->setReadOnly (journal->isReadOnly() ); + mEditor->setReadOnly ( journal->isReadOnly() ); int id = mJournal->calID(); QString calname = KOPrefs::instance()->getCalendar( id )->mName; 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 ) addTag("h2",i18n( "Remote: " ) +i18n("Journal from: ")); } } topLevelWidget()->setCaption("Journal Viewer"); - mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); - addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); + mText.append(i18n("<h3> %1 </h3> ").arg(jour->dtStartDateStr(KOPrefs::instance()->mShortDateInViewer))); if (!jour->summary().isEmpty()) { - addTag("p",i18n(" Title: ") + deTag(jour->summary())); + addTag("b",i18n(" Title: ") + deTag(jour->summary())); } + formatReadOnly(jour); + addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); + if (!jour->description().isEmpty()) { addTag("p",deTag(jour->description())); } setText(mText); } void KOEventViewer::formatReadOnly(Incidence *event) { + int id = event->calID(); + if ( id > 1 ) { + addTag("p", i18n("Calendar:")+" " + KOPrefs::instance()->getCalendar( id )->mName ); + } if (event->isReadOnly()) { addTag("p","<em>(" + i18n("read-only") + ")</em>"); } } |