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
@@ -179,34 +179,39 @@ void JournalEntry::toggleShowJournal()
     flushEntry();
     if ( showOnlyMode )
         emit showJournalOnly( 0 );
     else
         emit showJournalOnly( mJournal );
 }
 void JournalEntry::setShowOnly() 
 {
     showOnlyMode = true;
     mEditor->setFocus();
 }
 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 +")");
  
   mDirty = false;
 }
 
 Journal *JournalEntry::journal() const
 {
   return mJournal;
 }
 
 void JournalEntry::setDirty()
 {
   mDirty = true;
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index dcbb99f..8c1e5b2 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -686,45 +686,51 @@ void KOEventViewer::formatAttendees(Incidence *event)
 
 }
 void KOEventViewer::appendJournal(Journal *jour, int mode )
 { 
     bool shortDate = KOPrefs::instance()->mShortDateInViewer;
     if (mode == 0 ) {
         addTag("h2",i18n("Journal from: "));
     }
     else {
         if ( mode == 1 ) {
             addTag("h2",i18n( "Local: " ) +i18n("Journal from: "));
         } else {
             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>");
     }
 }
 void KOEventViewer::setSyncMode( bool b )
 {
     mSyncMode = b;
 }
 
 void KOEventViewer::setTodo(Todo *event, bool clearV )
 {
     if ( clearV )
         clearEvents();
     if ( mSyncMode ) {
         if ( clearV )
             appendTodo(event,1 );