1 files changed, 23 insertions, 13 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 3c38f34..4751d40 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -40,12 +40,14 @@
 #include <klocale.h>
 #include <ktextedit.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include "koprefs.h"
 #include <klineedit.h>
+#include <kdialog.h>
+#include "kolocationbox.h"
 
 #include <libkcal/journal.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
@@ -67,18 +69,19 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
     showOnlyMode = false;
   mCalendar = calendar;
   mJournal = 0;
   visibleMode = true;
   QHBox * vb = new QHBox ( this );
   QPixmap iconp;
-
+  vb->setMargin ( KDialog::marginHint()-1 );
   QPushButton * toggleJournal = new QPushButton( vb );
   iconp = SmallIcon("1updownarrow");
   toggleJournal->setPixmap (iconp ) ;
   new QLabel(" "+i18n("Title: "),vb);
-  mTitle = new KLineEdit ( 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);
   QPushButton * loadTemplate = new QPushButton( vb );
   QPushButton * saveTemplate = new QPushButton( vb );
   if ( QApplication::desktop()->width() < 321 ) 
@@ -92,24 +95,27 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   else
       iconp = SmallIcon("fileimport");
   loadTemplate->setPixmap (iconp ) ;
   loadTemplate->setFixedSize(  size, size );
   saveTemplate->setFixedSize(  size, size );
   toggleJournal->setFixedSize( size  , size );
+  mTitle->setMaximumHeight( size+4);
   mEditor = new KTextEdit(this);
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
 #endif
   mEditor->setWordWrap( KTextEdit::WidgetWidth );
   QBoxLayout *topLayout = new QVBoxLayout(this);
   topLayout->addWidget(vb);
   topLayout->addWidget(mEditor);
   mEditor->installEventFilter(this);
   connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
   connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
   connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
+  mTitle->load( KOLocationBox::SUMMARYJOURNAL );
+  mTitle->lineEdit ()->setText("");
 }
 
 JournalEntry::~JournalEntry()
 {
     //qDebug("JournalEntry::~JournalEntry() ");
 }
@@ -174,13 +180,13 @@ void JournalEntry::setDate(const QDate &date)
   QString calname = KOPrefs::instance()->getCalendar( id )->mName;
   mTitleLabel->setText( " (" + calname +")");
 }
 
 void JournalEntry::toggleShowJournal()
 { 
-    if (!mEditor->text().isEmpty() || !mTitle->text().isEmpty())
+    if (!mEditor->text().isEmpty() || !mTitle->currentText ().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() 
@@ -192,47 +198,48 @@ void JournalEntry::setVisibleOn()
 {
     visibleMode = true;
 }
 void JournalEntry::setShowOnly() 
 {
     showOnlyMode = true;
-    if ( mTitle->text().isEmpty() ) 
+    if ( mTitle->currentText().isEmpty() ) 
         mTitle->setFocus();
     else
         mEditor->setFocus();
 }
 void JournalEntry::setJournal(Journal *journal)
 {
   writeJournal();
+  mTitle->load( KOLocationBox::SUMMARYJOURNAL );
 
   mJournal = journal;
   if ( journal->isReadOnly()  )
-      mTitle->setText(mJournal->summary()+" ("+i18n("readonly")+")");
+      mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")");
   else
-      mTitle->setText(mJournal->summary());
+      mTitle->lineEdit ()->setText(mJournal->summary());
   mEditor->setText(mJournal->description());
-  mTitle->setReadOnly (journal->isReadOnly()   );
+  mTitle->setEnabled (!journal->isReadOnly()   );
   mEditor->setReadOnly ( journal->isReadOnly()  );
   int id = mJournal->calID();
  
   QString calname = KOPrefs::instance()->getCalendar( id )->mName;
   mTitleLabel->setText( " (" + calname +")");
- 
 }
 
 Journal *JournalEntry::journal() const
 {
   return mJournal;
 }
 
 
 void JournalEntry::clear()
 {
   mJournal = 0;
   mEditor->setText("");
-  mTitle->setText("");
+  mTitle->load( KOLocationBox::SUMMARYJOURNAL );
+  mTitle->lineEdit ()->setText("");
 }
 
 bool JournalEntry::eventFilter( QObject *o, QEvent *e )
 {
 //  kdDebug() << "JournalEntry::event received " << e->type() << endl;
 
@@ -250,13 +257,13 @@ bool JournalEntry::eventFilter( QObject *o, QEvent *e )
   return QFrame::eventFilter( o, e );    // standard event processing
 }
 
 void JournalEntry::writeJournal()
 {
     if ( !visibleMode ) return;
-  if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) {
+  if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) {
       if ( mJournal ) {
           Journal* j = mJournal;
           mJournal = 0;
           bool conf = KOPrefs::instance()->mConfirm;
           KOPrefs::instance()->mConfirm = false;
           emit deleteJournal(j);
@@ -269,16 +276,19 @@ void JournalEntry::writeJournal()
   
   if (!mJournal) {
     mJournal = new Journal;
     mJournal->setDtStart(QDateTime(mDate,QTime(0,0,0)));
     mCalendar->addJournal(mJournal);
   }
-  if ( mJournal->description() != mEditor->text() )
+  if ( mJournal->description() != mEditor->text() ) {
       mJournal->setDescription(mEditor->text());
-  if ( mJournal->summary() != mTitle->text() )
-      mJournal->setSummary(mTitle->text());
+  }
+  if ( mJournal->summary() != mTitle->currentText() ) {
+      mJournal->setSummary(mTitle->currentText());
+      mTitle->save(KOLocationBox::SUMMARYJOURNAL);
+  }
 }
 
 void JournalEntry::flushEntry()
 {
    writeJournal();
 }