fixes

1 files changed, 52 insertions, 46 deletions

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 74037e6..8439b81 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -55,2 +55,3 @@
 #include <kstandarddirs.h>
+#include <kglobalsettings.h>
 
@@ -76,2 +77,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 
+    setFont( KGlobalSettings::generalFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
@@ -80,2 +82,8 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KGlobal::locale()->insertCatalogue("timezones");
+  mSpacingHint = spacingHintSmall();
+   mMarginHint = marginHintSmall();
+#ifndef DESKTOP_VERSION
+  if ( QApplication::desktop()->height() == 480  )
+      hideButtons();
+#endif
 
@@ -96,6 +104,3 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 
-#ifndef DESKTOP_VERSION
-  if ( QApplication::desktop()->height() == 480  )
-      hideButtons();
-#endif
+
 }
@@ -120,4 +125,4 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
-   topLayout->setSpacing(spacingHint());
-   topLayout->setMargin(marginHint());  
+   topLayout->setSpacing(mSpacingHint);
+   topLayout->setMargin(mMarginHint);  
    int iii = 0;
@@ -176,4 +181,4 @@ void  KOPrefsDialog::setupLocaleTab()
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
-   topLayout->setSpacing(spacingHint());
-   topLayout->setMargin(marginHint());  
+   topLayout->setSpacing(mSpacingHint);
+   topLayout->setMargin(mMarginHint);  
    int iii = 0;
@@ -248,4 +253,4 @@ void KOPrefsDialog::setupSyncAlgTab()
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
-   topLayout->setSpacing(spacingHint());
-   topLayout->setMargin(marginHint());  
+   topLayout->setSpacing(mSpacingHint);
+   topLayout->setMargin(mMarginHint);  
    int iii = 0;  
@@ -289,4 +294,4 @@ void KOPrefsDialog::setupSyncTab()
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
-   topLayout->setSpacing(spacingHint());
-   topLayout->setMargin(marginHint());
+   topLayout->setSpacing(mSpacingHint);
+   topLayout->setMargin(mMarginHint);
    lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
@@ -339,4 +344,4 @@ void KOPrefsDialog::setupMainTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
 
@@ -400,3 +405,3 @@ void KOPrefsDialog::setupMainTab()
   QHBox *intervalBox = new QHBox(topFrame);
-  // intervalBox->setSpacing(spacingHint());
+  // intervalBox->setSpacing(mSpacingHint);
   topLayout->addMultiCellWidget(intervalBox,6,6,0,1);
@@ -490,4 +495,4 @@ void KOPrefsDialog::setupTimeTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
  
@@ -563,4 +568,4 @@ void KOPrefsDialog::setupViewsTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
 
@@ -608,4 +613,4 @@ void KOPrefsDialog::setupViewsTab()
   topLayout = new QGridLayout(topFrame,6,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
   ii = 0;
@@ -655,3 +660,3 @@ void KOPrefsDialog::setupViewsTab()
 
-
+#ifdef DESKTOP_VERSION
   KPrefsDialogWidBool *enableToolTips =
@@ -660,3 +665,3 @@ void KOPrefsDialog::setupViewsTab()
   topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
-
+#endif
   //  *********************************************************
@@ -667,4 +672,4 @@ void KOPrefsDialog::setupViewsTab()
   topLayout = new QGridLayout(topFrame,5,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
   ii = 0;
@@ -714,4 +719,5 @@ void KOPrefsDialog::setupViewsTab()
   topLayout = new QGridLayout(topFrame,5,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
+  qDebug("%d %d ",mSpacingHint, mMarginHint );
   ii = 0;
@@ -808,4 +814,4 @@ void KOPrefsDialog::setupViewsTab()
   topLayout = new QGridLayout(topFrame,4,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
   ii = 0;
@@ -820,3 +826,3 @@ void KOPrefsDialog::setupViewsTab()
   QHBox *prioBox = new QHBox(topFrame);
-  // intervalBox->setSpacing(spacingHint());
+  // intervalBox->setSpacing(mSpacingHint);
   topLayout->addWidget(prioBox,ii++,0);
@@ -864,4 +870,4 @@ void KOPrefsDialog::setupViewsTab()
   topLayout = new QGridLayout(topFrame,4,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
   ii = 0;
@@ -930,4 +936,4 @@ dummy =
   topLayout = new QGridLayout(topFrame,4,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
   ii = 0;
@@ -965,4 +971,4 @@ dummy =
   topLayout = new QGridLayout(topFrame,2,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
   int iii = 0;
@@ -1191,4 +1197,4 @@ void KOPrefsDialog::setupColorsTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
-  // topLayout->setSpacing(spacingHint());
-  // topLayout->setMargin(marginHint());
+  // topLayout->setSpacing(mSpacingHint);
+  // topLayout->setMargin(mMarginHint);
 
@@ -1300,4 +1306,4 @@ void KOPrefsDialog::setupPrinterTab()
   QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
 
@@ -1313,4 +1319,4 @@ void KOPrefsDialog::setupGroupSchedulingTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
 
@@ -1364,4 +1370,4 @@ void KOPrefsDialog::setupGroupAutomationTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);
 
@@ -1663,4 +1669,4 @@ void KOPrefsDialog::setupTimeZoneTab()
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
-  topLayout->setSpacing(spacingHint());
-  topLayout->setMargin(marginHint());
+  topLayout->setSpacing(mSpacingHint);
+  topLayout->setMargin(mMarginHint);