1 files changed, 9 insertions, 2 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 9e2c902..ca8d5f7 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -153,48 +153,55 @@ void JournalEntry::slotLoadTemplate()
     QTextStream tsIn( &fileIn );
     tsIn.setCodec( QTextCodec::codecForName("utf8") );
     QString text =  tsIn.read();
     fileIn.close();  
     int line, col;
     mEditor->getCursorPosition (& line, & col );
     mEditor-> insertAt ( text, line, col, true ); 
     //mEditor->setIgnoreMark( true );
 }
 void JournalEntry::setDate(const QDate &date)
 {
     showOnlyMode = false;
-  mDate = date;
   writeJournal();
+  mDate = date;
   int id = mCalendar->defaultCalendar();
   QString calname = KOPrefs::instance()->getCalendar( id )->mName;
   mTitleLabel->setText( " (" + calname +")");
 }
 
 void JournalEntry::toggleShowJournal()
 { 
     if (!mEditor->text().isEmpty() || !mTitle->text().isEmpty())
         flushEntry();
     if ( showOnlyMode )
         emit showJournalOnly( 0 );
     else {
         // we have to protect mJournal from deleting if mJournal has empty text
         visibleMode = false; // set to true via :setShowOnly() 
         emit showJournalOnly( mJournal );
+        //QTimer::singleShot( 0, this, SLOT( setVisibleOn() ) );
     }
 }
+void JournalEntry::setVisibleOn() 
+{
+    visibleMode = true;
+}
 void JournalEntry::setShowOnly() 
 {
     showOnlyMode = true;
+    if ( mTitle->text().isEmpty() ) 
+        mTitle->setFocus();
+    else
     mEditor->setFocus();
-    visibleMode = true;
 }
 void JournalEntry::setJournal(Journal *journal)
 {
   writeJournal();
 
   mJournal = journal;
   if ( journal->isReadOnly()  )
       mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")");
   else
       mTitle->setText(mJournal->summary());
   mEditor->setText(mJournal->description());
   mTitle->setReadOnly (journal->isReadOnly()   );