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
@@ -193,6 +193,11 @@ void JournalEntry::setJournal(Journal *journal)
 
   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();
  
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index dcbb99f..8c1e5b2 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -700,9 +700,11 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
     }
     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()));
@@ -713,4 +715,8 @@ void KOEventViewer::appendJournal(Journal *jour, int mode )
 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>");