1 files changed, 12 insertions, 2 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 56221dc..902e96f 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -76,10 +76,18 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   QPushButton * toggleJournal = new QPushButton( vb );
   iconp = SmallIcon("1updownarrow");
   toggleJournal->setPixmap (iconp ) ;
-  new QLabel(" "+i18n("Title: "),vb);
+  vb->setStretchFactor (new QLabel(" "+i18n("Title: "),vb),1);
+  vb->setStretchFactor( toggleJournal, 1 );
   mTitle = new KOLocationBox(TRUE, vb, 30);
   mTitle->setSizePolicy( QSizePolicy(  QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed  ,FALSE) );
   mCalendarBox = new QComboBox(vb);
+  mCalendarBox->setSizePolicy( QSizePolicy(  QSizePolicy::MinimumExpanding ,QSizePolicy::Fixed  ,FALSE) );
+#ifndef DESKTOP_VERSION
+  mTitle->setSizeLimit( 8 );
+  mCalendarBox->setSizeLimit( 8 );
+#endif
+  vb->setStretchFactor ( mTitle, 8 );
+  vb->setStretchFactor ( mCalendarBox, 3 ); 
   //mTitleLabel->setMargin(0);
   //mTitleLabel->setAlignment(AlignCenter);
   QPushButton * loadTemplate = new QPushButton( vb );
@@ -203,8 +211,9 @@ void JournalEntry::fillCalendar( int setToID )
     mCalendarBox->setCurrentItem( std );
     if ( KOPrefs::instance()->mCalendars.count() == 1 )
         mCalendarBox->hide();
-    else
+    else {
         mCalendarBox->show();
+    }
 }
 
 void JournalEntry::toggleShowJournal()
@@ -246,6 +255,7 @@ void JournalEntry::setJournal(Journal *journal, bool saveJournal )
   mEditor->setText(mJournal->description());
   mTitle->setEnabled (!journal->isReadOnly()   );
   mEditor->setReadOnly ( journal->isReadOnly()  );
+  mCalendarBox->setEnabled (!journal->isReadOnly()   );
   fillCalendar( mJournal->calID() );
 }