layout fix

2 files changed, 10 insertions, 4 deletions

diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 739949d..5fc3f2f 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -68,26 +68,24 @@ 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 ) ;
   QLabel* textLabel = new QLabel(" "+i18n("Title: "),vb);
-  vb->setStretchFactor (textLabel,1);
-  vb->setStretchFactor( toggleJournal, 1 );
   mTitle = new KOLocationBox(TRUE, vb, 30);
   mTitle->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred ,QSizePolicy::Fixed  ,FALSE) );
   mCalendarBox = new QComboBox(vb);
   mCalendarBox->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred ,QSizePolicy::Fixed  ,FALSE) );
 #ifndef DESKTOP_VERSION
   mTitle->setSizeLimit( 8 );
   mCalendarBox->setSizeLimit( 8 );
 #endif
   vb->setStretchFactor ( mTitle, 8 );
   int limit = 3;
   if ( QApplication::desktop()->width() < 640 )
       limit = 6;
@@ -100,25 +98,28 @@ JournalEntry::JournalEntry(Calendar *calendar,QWidget *parent) :
       iconp = SmallIcon("fileexport16");
   else
       iconp = SmallIcon("fileexport");
   saveTemplate->setPixmap (iconp ) ;
   int size = saveTemplate->sizeHint().height();
   if ( QApplication::desktop()->width() < 321 ) 
       iconp = SmallIcon("fileimport16");
   else
       iconp = SmallIcon("fileimport");
   loadTemplate->setPixmap (iconp ) ;
   loadTemplate->setFixedSize(  size, size );
   saveTemplate->setFixedSize(  size, size );
-  toggleJournal->setFixedSize( size  , size );
+  int widwid = size;
+  if ( QApplication::desktop()->width() < 320 )
+      widwid = size/2+1;
+  toggleJournal->setFixedSize( widwid , size );
   mTitle->setFixedHeight( size+4);
   mCalendarBox->setFixedHeight( size+4);
   mEditor = new KTextEdit(this);
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation( mEditor, QPEApplication::RightOnHold );
 #endif
   mMaxWidDiff = 3*size - 2*frameWidth() - textLabel->sizeHint().width();
   mDeskWid = QApplication::desktop()->width();
   int maxwid = mDeskWid - mMaxWidDiff;
   if ( QApplication::desktop()->width() < 640 ) {
       mTitle->setMaximumWidth( maxwid/2 +20 );
       mCalendarBox->setMaximumWidth( maxwid/2 -20);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index aa55d82..e601eef 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -116,25 +116,30 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     mCalendarBox = new QComboBox ( parent );
     mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding ,FALSE) );
     if ( QApplication::desktop()->height() < 320 ) {
         headerLayout->addWidget(mLocationEdit,0,3);
         headerLayout->addWidget(mCalendarBox,0,4);
         headerLayout->setColStretch( 1, 10);
         headerLayout->setColStretch( 3, 10);
         mCalendarBox->setMaximumWidth( 64 );
     }
     else {
         headerLayout->addWidget(mLocationEdit,1,1);
         headerLayout->addWidget(mCalendarBox,1,2);
-        headerLayout->setColStretch( 1, 3);
+        int str = 3;
+        if ( QApplication::desktop()->width() < 320 ) {
+            --str;
+            --str;
+        }
+        headerLayout->setColStretch( 1, str);
         headerLayout->setColStretch( 2, 1);
     }
     
 }
 void KOEditorGeneral::setFocusOn( int i )
 {
     mNextFocus = i;
     QTimer::singleShot( 0, this, SLOT ( slotSetFocusOn() ));
 }
 void KOEditorGeneral::slotSetFocusOn()
 {
     mNextFocus;