1 files changed, 41 insertions, 12 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 4751d40..56221dc 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -79,9 +79,9 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   new QLabel(" "+i18n("Title: "),vb);
   mTitle = new KOLocationBox(TRUE, vb, 30);
   mTitle->setSizePolicy( QSizePolicy(  QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed  ,FALSE) );
-  mTitleLabel = new QLabel(i18n("Title"),vb);
-  mTitleLabel->setMargin(0);
-  mTitleLabel->setAlignment(AlignCenter);
+  mCalendarBox = new QComboBox(vb);
+  //mTitleLabel->setMargin(0);
+  //mTitleLabel->setAlignment(AlignCenter);
   QPushButton * loadTemplate = new QPushButton( vb );
   QPushButton * saveTemplate = new QPushButton( vb );
   if ( QApplication::desktop()->width() < 321 ) 
@@ -99,6 +99,7 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   saveTemplate->setFixedSize(  size, size );
   toggleJournal->setFixedSize( size  , size );
   mTitle->setMaximumHeight( size+4);
+  mCalendarBox->setMaximumHeight( size+4);
   mEditor = new KTextEdit(this);
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
@@ -176,9 +177,34 @@ void JournalEntry::setDate(const QDate &date)
     showOnlyMode = false;
   writeJournal();
   mDate = date;
-  int id = mCalendar->defaultCalendar();
-  QString calname = KOPrefs::instance()->getCalendar( id )->mName;
-  mTitleLabel->setText( " (" + calname +")");
+  fillCalendar( mCalendar->defaultCalendar() );
+}
+void JournalEntry::fillCalendar( int setToID )
+{
+    mCalendarBox->clear();
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    int std = 0;
+    int count = 0;
+    while ( kkf ) {
+        if ( (!kkf->mErrorOnLoad &&! kkf->isReadOnly) ||  setToID == kkf->mCalNumber ) {
+            if ( setToID ) {
+                if ( kkf->mCalNumber == setToID ) 
+                    std = count;
+            } else {
+                if ( kkf->isStandard ) {
+                    std = count;
+                }
+            }
+            ++count;
+            mCalendarBox->insertItem( kkf->mName );
+        }
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+    mCalendarBox->setCurrentItem( std );
+    if ( KOPrefs::instance()->mCalendars.count() == 1 )
+        mCalendarBox->hide();
+    else
+        mCalendarBox->show();
 }
 
 void JournalEntry::toggleShowJournal()
@@ -206,9 +232,10 @@ void JournalEntry::setShowOnly()
     else
         mEditor->setFocus();
 }
-void JournalEntry::setJournal(Journal *journal)
+void JournalEntry::setJournal(Journal *journal, bool saveJournal )
 {
-  writeJournal();
+    if ( saveJournal )
+        writeJournal();
   mTitle->load( KOLocationBox::SUMMARYJOURNAL );
 
   mJournal = journal;
@@ -219,10 +246,7 @@ void JournalEntry::setJournal(Journal *journal)
   mEditor->setText(mJournal->description());
   mTitle->setEnabled (!journal->isReadOnly()   );
   mEditor->setReadOnly ( journal->isReadOnly()  );
-  int id = mJournal->calID();
- 
-  QString calname = KOPrefs::instance()->getCalendar( id )->mName;
-  mTitleLabel->setText( " (" + calname +")");
+  fillCalendar( mJournal->calID() );
 }
 
 Journal *JournalEntry::journal() const
@@ -260,6 +284,7 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 void JournalEntry::writeJournal()
 {
     if ( !visibleMode ) return;
+    if ( !mTitle->isEnabled() ) return;
   if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) {
       if ( mJournal ) {
           Journal* j = mJournal;
@@ -286,6 +311,10 @@ void JournalEntry::writeJournal()
       mJournal->setSummary(mTitle->currentText());
       mTitle->save(KOLocationBox::SUMMARYJOURNAL);
   }
+  int id = KOPrefs::instance()->getCalendarID( mCalendarBox->currentText() );
+  if ( mJournal->calID() != id ) {
+      mJournal->setCalID( id );
+  }
 }
 
 void JournalEntry::flushEntry()