box

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
@@ -45,2 +45,4 @@
 #include <klineedit.h>
+#include <kdialog.h>
+#include "kolocationbox.h"
 
@@ -72,3 +74,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QPixmap iconp;
-
+  vb->setMargin ( KDialog::marginHint()-1 );
   QPushButton * toggleJournal = new QPushButton( vb );
@@ -77,3 +79,4 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   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);
@@ -97,2 +100,3 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   toggleJournal->setFixedSize( size  , size );
+  mTitle->setMaximumHeight( size+4);
   mEditor = new KTextEdit(this);
@@ -109,2 +113,4 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   connect( toggleJournal, SIGNAL( clicked() ), this , SLOT( toggleShowJournal() ) );
+  mTitle->load( KOLocationBox::SUMMARYJOURNAL );
+  mTitle->lineEdit ()->setText("");
 }
@@ -179,3 +185,3 @@ void JournalEntry::toggleShowJournal()
 { 
-    if (!mEditor->text().isEmpty() || !mTitle->text().isEmpty())
+    if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
         flushEntry();
@@ -197,3 +203,3 @@ void JournalEntry::setShowOnly()
     showOnlyMode = true;
-    if ( mTitle->text().isEmpty() ) 
+    if ( mTitle->currentText().isEmpty() ) 
         mTitle->setFocus();
@@ -205,2 +211,3 @@ void JournalEntry::setJournal(Journal *journal)
   writeJournal();
+  mTitle->load( KOLocationBox::SUMMARYJOURNAL );
 
@@ -208,7 +215,7 @@ void JournalEntry::setJournal(Journal *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()  );
@@ -218,3 +225,2 @@ void JournalEntry::setJournal(Journal *journal)
   mTitleLabel->setText( " (" + calname +")");
- 
 }
@@ -231,3 +237,4 @@ void JournalEntry::clear()
   mEditor->setText("");
-  mTitle->setText("");
+  mTitle->load( KOLocationBox::SUMMARYJOURNAL );
+  mTitle->lineEdit ()->setText("");
 }
@@ -255,3 +262,3 @@ void JournalEntry::writeJournal()
     if ( !visibleMode ) return;
-  if (mEditor->text().isEmpty() && mTitle->text().isEmpty()) {
+  if (mEditor->text().isEmpty() && mTitle->currentText().isEmpty()) {
       if ( mJournal ) {
@@ -274,6 +281,9 @@ void JournalEntry::writeJournal()
   }
-  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);
+  }
 }