1 files changed, 61 insertions, 41 deletions

diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index 802261c..bdfc637 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -90,4 +90,6 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   if ( QApplication::desktop()->width() <= 320 ) {
-      //mListView->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding) );
-      mListView->setFixedHeight(80);
+      int hei = 80;
+      if ( QApplication::desktop()->height() <= 240  )
+          hei = 60;
+      mListView->setFixedHeight(hei);
   }
@@ -149,42 +151,60 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
   //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
-
-  if (qApp->desktop()->width() < 640 ) {
-      if ( qApp->desktop()->width() < 300 )
-          topLayout->setSpacing(1);
-          ;//mListView->setFixedHeight(80);
-      topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
-      topLayout->addMultiCellWidget(mListView,1,1,0,3);
-      topLayout->addWidget(attendeeLabel,3,0);
-      topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
-      topLayout->addWidget(emailLabel,4,0);
-      topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2);
-      topLayout->addWidget(attendeeRoleLabel,5,0);
-      topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3);
-      topLayout->addWidget(statusLabel,6,0);
-      topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3);
-      topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3);
-      topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
-      topLayout->addMultiCellWidget(buttonBox,3,4,3,3);
-      topLayout->setRowStretch(1,2);
-      topLayout->setColStretch(0,0);
-      topLayout->setColStretch(1,2);
-      topLayout->setColStretch(2,1);
-      topLayout->setColStretch(3,1);
-
-  } else {
+  if ( QApplication::desktop()->height() <= 240 ) {
+      mRoleCombo->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Minimum ,FALSE) );
+      mStatusCombo->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Minimum  ,FALSE) );
       topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5);
-      topLayout->addMultiCellWidget(mListView,1,1,0,5);
-      topLayout->addWidget(attendeeLabel,3,0);
-      topLayout->addMultiCellWidget(mNameEdit,3,3,1,4);
-      topLayout->addWidget(emailLabel,4,0);
-      topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4);
-      topLayout->addWidget(attendeeRoleLabel,5,0);
-      topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2);
-      topLayout->addWidget(statusLabel,5,3);
-      topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5);
-      topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5);
-      topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
-      topLayout->addMultiCellWidget(buttonBox,3,4,5,5);
-      topLayout->setRowStretch(1,5);
-      topLayout->setColStretch(0,0);
+          topLayout->addMultiCellWidget(mListView,1,1,0,5);
+          topLayout->addWidget(attendeeLabel,3,0);
+          topLayout->addMultiCellWidget(mNameEdit,3,3,1,4);
+          topLayout->addWidget(emailLabel,4,0);
+          topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4);
+          topLayout->addWidget(attendeeRoleLabel,5,0);
+          topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2);
+          topLayout->addWidget(statusLabel,5,3);
+          topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5);
+          topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,5);
+          topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
+          topLayout->addMultiCellWidget(buttonBox,3,4,5,5);
+          topLayout->setRowStretch(1,5);
+          topLayout->setColStretch(0,0);
+  } else {
+      if (qApp->desktop()->width() < 640 ) {
+          if ( qApp->desktop()->width() < 300 )
+              topLayout->setSpacing(1);
+          ;//mListView->setFixedHeight(80);
+          topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
+          topLayout->addMultiCellWidget(mListView,1,1,0,3);
+          topLayout->addWidget(attendeeLabel,3,0);
+          topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
+          topLayout->addWidget(emailLabel,4,0);
+          topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2);
+          topLayout->addWidget(attendeeRoleLabel,5,0);
+          topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3);
+          topLayout->addWidget(statusLabel,6,0);
+          topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3);
+          topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3);
+          topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
+          topLayout->addMultiCellWidget(buttonBox,3,4,3,3);
+          topLayout->setRowStretch(1,2);
+          topLayout->setColStretch(0,0);
+          topLayout->setColStretch(1,2);
+          topLayout->setColStretch(2,1);
+          topLayout->setColStretch(3,1);
+      } else {
+          topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5);
+          topLayout->addMultiCellWidget(mListView,1,1,0,5);
+          topLayout->addWidget(attendeeLabel,3,0);
+          topLayout->addMultiCellWidget(mNameEdit,3,3,1,4);
+          topLayout->addWidget(emailLabel,4,0);
+          topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4);
+          topLayout->addWidget(attendeeRoleLabel,5,0);
+          topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2);
+          topLayout->addWidget(statusLabel,5,3);
+          topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5);
+          topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5);
+          topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
+          topLayout->addMultiCellWidget(buttonBox,3,4,5,5);
+          topLayout->setRowStretch(1,5);
+          topLayout->setColStretch(0,0);
+      }
   }