-rw-r--r-- | korganizer/koprefsdialog.cpp | 98 |
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 @@ -54,4 +54,5 @@ #include <kemailsettings.h> #include <kstandarddirs.h> +#include <kglobalsettings.h> #include <kurlrequester.h> @@ -75,8 +76,15 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : { + setFont( KGlobalSettings::generalFont() ); setCaption( i18n("Preferences - some settings need a restart (nr)")); mCategoryDict.setAutoDelete(true); KGlobal::locale()->insertCatalogue("timezones"); + mSpacingHint = spacingHintSmall(); + mMarginHint = marginHintSmall(); +#ifndef DESKTOP_VERSION + if ( QApplication::desktop()->height() == 480 ) + hideButtons(); +#endif setupGlobalTab(); @@ -95,8 +103,5 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : //setupGroupAutomationTab(); -#ifndef DESKTOP_VERSION - if ( QApplication::desktop()->height() == 480 ) - hideButtons(); -#endif + } @@ -119,6 +124,6 @@ void KOPrefsDialog::setupLocaleDateTab() 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; @@ -175,6 +180,6 @@ void KOPrefsDialog::setupLocaleTab() QFrame *topFrame = addPage(i18n("Locale"),0,0); QGridLayout *topLayout = new QGridLayout(topFrame,4,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); int iii = 0; KPrefsDialogWidRadios *syncPrefsGroup = @@ -247,6 +252,6 @@ void KOPrefsDialog::setupSyncAlgTab() mSetupSyncAlgTab = topFrame; QGridLayout *topLayout = new QGridLayout(topFrame,6,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); int iii = 0; @@ -288,6 +293,6 @@ void KOPrefsDialog::setupSyncTab() QFrame *topFrame = addPage(i18n("Sync Network"),0,0); 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); int iii = 0; @@ -338,6 +343,6 @@ void KOPrefsDialog::setupMainTab() QGridLayout *topLayout = new QGridLayout(topFrame,5,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); // KPrefsDialogWidBool *emailControlCenter = @@ -399,5 +404,5 @@ void KOPrefsDialog::setupMainTab() QHBox *intervalBox = new QHBox(topFrame); - // intervalBox->setSpacing(spacingHint()); + // intervalBox->setSpacing(mSpacingHint); topLayout->addMultiCellWidget(intervalBox,6,6,0,1); QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); @@ -489,6 +494,6 @@ void KOPrefsDialog::setupTimeTab() QGridLayout *topLayout = new QGridLayout(topFrame,4,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); QHBox *dummy = new QHBox(topFrame); @@ -562,6 +567,6 @@ void KOPrefsDialog::setupViewsTab() QGridLayout *topLayout = new QGridLayout(topFrame,6,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); // QBoxLayout *dayBeginsLayout = new QHBoxLayout; @@ -607,6 +612,6 @@ void KOPrefsDialog::setupViewsTab() topLayout = new QGridLayout(topFrame,6,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); ii = 0; @@ -654,10 +659,10 @@ void KOPrefsDialog::setupViewsTab() topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); - +#ifdef DESKTOP_VERSION KPrefsDialogWidBool *enableToolTips = addWidBool(i18n("Enable tooltips displaying summary of ev."), &(KOPrefs::instance()->mEnableToolTips),topFrame); topLayout->addWidget(enableToolTips->checkBox(),ii++,0); - +#endif // ********************************************************* @@ -666,6 +671,6 @@ void KOPrefsDialog::setupViewsTab() topLayout = new QGridLayout(topFrame,5,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); ii = 0; @@ -713,6 +718,7 @@ 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; QLabel *lab; @@ -807,6 +813,6 @@ void KOPrefsDialog::setupViewsTab() topLayout = new QGridLayout(topFrame,4,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); ii = 0; @@ -819,5 +825,5 @@ void KOPrefsDialog::setupViewsTab() QHBox *prioBox = new QHBox(topFrame); - // intervalBox->setSpacing(spacingHint()); + // intervalBox->setSpacing(mSpacingHint); topLayout->addWidget(prioBox,ii++,0); QString messa = i18n("Show topmost todo prios in What's Next:"); @@ -863,6 +869,6 @@ void KOPrefsDialog::setupViewsTab() topLayout = new QGridLayout(topFrame,4,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); ii = 0; dummy = @@ -929,6 +935,6 @@ dummy = topLayout = new QGridLayout(topFrame,4,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); ii = 0; lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); @@ -964,6 +970,6 @@ dummy = topLayout = new QGridLayout(topFrame,2,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); int iii = 0; @@ -1190,6 +1196,6 @@ void KOPrefsDialog::setupColorsTab() QGridLayout *topLayout = new QGridLayout(topFrame,5,2); - // topLayout->setSpacing(spacingHint()); - // topLayout->setMargin(marginHint()); + // topLayout->setSpacing(mSpacingHint); + // topLayout->setMargin(mMarginHint); topLayout->setSpacing(2); @@ -1299,6 +1305,6 @@ void KOPrefsDialog::setupPrinterTab() QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); topLayout->setRowStretch(4,1); @@ -1312,6 +1318,6 @@ void KOPrefsDialog::setupGroupSchedulingTab() QGridLayout *topLayout = new QGridLayout(topFrame,6,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); #if 0 @@ -1363,6 +1369,6 @@ void KOPrefsDialog::setupGroupAutomationTab() QGridLayout *topLayout = new QGridLayout(topFrame,5,1); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); KPrefsDialogWidRadios *autoRefreshGroup = @@ -1662,6 +1668,6 @@ void KOPrefsDialog::setupTimeZoneTab() QGridLayout *topLayout = new QGridLayout(topFrame,5,2); - topLayout->setSpacing(spacingHint()); - topLayout->setMargin(marginHint()); + topLayout->setSpacing(mSpacingHint); + topLayout->setMargin(mMarginHint); QHBox *timeZoneBox = new QHBox( topFrame ); |