fixxx

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
@@ -73,16 +73,24 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
   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);
+  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 );
   QPushButton * saveTemplate = new QPushButton( vb );
   if ( QApplication::desktop()->width() < 321 ) 
       iconp = SmallIcon("fileexport16");
@@ -200,15 +208,16 @@ void JournalEntry::fillCalendar( int setToID )
         }
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     mCalendarBox->setCurrentItem( std );
     if ( KOPrefs::instance()->mCalendars.count() == 1 )
         mCalendarBox->hide();
-    else
+    else {
         mCalendarBox->show();
 }
+}
 
 void JournalEntry::toggleShowJournal()
 { 
     if (!mEditor->text().isEmpty() || !mTitle->currentText ().isEmpty())
         flushEntry();
     if ( showOnlyMode )
@@ -243,12 +252,13 @@ void JournalEntry::setJournal(Journal *journal, bool saveJournal )
       mTitle->lineEdit ()->setText(mJournal->summary()+" ("+i18n("readonly")+")");
   else
       mTitle->lineEdit ()->setText(mJournal->summary());
   mEditor->setText(mJournal->description());
   mTitle->setEnabled (!journal->isReadOnly()   );
   mEditor->setReadOnly ( journal->isReadOnly()  );
+  mCalendarBox->setEnabled (!journal->isReadOnly()   );
   fillCalendar( mJournal->calID() );
 }
 
 Journal *JournalEntry::journal() const
 {
   return mJournal;