fixxx

1 files changed, 46 insertions, 4 deletions

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -285,6 +285,13 @@ void KOPrefsDialog::setupMainTab()
              &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), iii,iii,0,1); 
   ++iii;
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("General") +" 2",0,0);
+      topLayout = new QGridLayout(topFrame,4,2);
+      topLayout->setSpacing(2);
+      topLayout->setMargin(3);
+      iii = 0;
+  }
   QHBox *dummy = new QHBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
   mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
@@ -431,12 +438,19 @@ void KOPrefsDialog::setupTimeTab()
   mAlarmTimeCombo = new QComboBox(topFrame);
   mAlarmTimeCombo->insertStringList(alarmList);
   topLayout->addWidget(mAlarmTimeCombo,3,1);
-
+  int iii = 4;
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("Time") +" 2",0,0);
+      topLayout = new QGridLayout(topFrame,1,2);
+      topLayout->setSpacing(2);
+      topLayout->setMargin(3);
+      iii = 0;
+  }
 
   QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
                                                i18n("Working Hours"),
                                                topFrame);
-  topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
+  topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
   workingHoursGroup->layout()->setMargin( 4 );
   QHBox *workStartBox = new QHBox(workingHoursGroup);
@@ -702,6 +716,18 @@ void KOPrefsDialog::setupViewsTab()
     addWidBool(i18n("Category colors are applied to text"),
                &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+
+
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("Month View") +" 2",0,0);
+      topLayout = new QGridLayout(topFrame,4,1);
+      topLayout->setSpacing(2);
+      topLayout->setMargin(1);
+      ii = 0;
+  }
+
+
  coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses day colors"),
                   &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
@@ -901,9 +927,13 @@ dummy =
     addWidBool(i18n("Use internal alarm notification"),
                &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
   topLayout->addWidget(dummy->checkBox(),iii++,0);
-  lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
 
-   topLayout->addWidget(lab ,iii++,0);
+  if (  QApplication::desktop()->height() > 240 ) {
+      
+      lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
+      
+      topLayout->addWidget(lab ,iii++,0);
+  }
 #ifndef DESKTOP_VERSION
     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
@@ -1164,6 +1194,18 @@ void KOPrefsDialog::setupColorsTab()
   topLayout->addWidget(eventColor->label(),ii,0);
   topLayout->addWidget(eventColor->button(),ii++,1);
 
+  if (  QApplication::desktop()->height() <= 240 ) {
+      topFrame = addPage(i18n("Colors") +" 2",0,0);
+      //  DesktopIcon("colorize",KIcon::SizeMedium));
+      
+      topLayout = new QGridLayout(topFrame,5,2);
+      // topLayout->setSpacing(mSpacingHint);
+      // topLayout->setMargin(mMarginHint);
+      
+      topLayout->setSpacing(2);
+      topLayout->setMargin(3);
+  }
+  
 
   // agenda view background color
   KPrefsDialogWidColor *agendaBgColor =