author | zautrix <zautrix> | 2005-04-01 18:10:09 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-01 18:10:09 (UTC) |
commit | edc032c21ae3788d02a632ea8066e4ac5a4feedb (patch) (unidiff) | |
tree | 8e59c8dcf1cc3021694025627d36e152f7adc389 /korganizer/koprefsdialog.cpp | |
parent | 5d88f92b76a760f100384ea5fa6ed143088d19bb (diff) | |
download | kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.zip kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.tar.gz kdepimpi-edc032c21ae3788d02a632ea8066e4ac5a4feedb.tar.bz2 |
fixes
-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 | |||
@@ -53,6 +53,7 @@ | |||
53 | #include <kiconloader.h> | 53 | #include <kiconloader.h> |
54 | #include <kemailsettings.h> | 54 | #include <kemailsettings.h> |
55 | #include <kstandarddirs.h> | 55 | #include <kstandarddirs.h> |
56 | #include <kglobalsettings.h> | ||
56 | 57 | ||
57 | #include <kurlrequester.h> | 58 | #include <kurlrequester.h> |
58 | #include <klineedit.h> | 59 | #include <klineedit.h> |
@@ -74,10 +75,17 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
74 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 75 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
75 | { | 76 | { |
76 | 77 | ||
78 | setFont( KGlobalSettings::generalFont() ); | ||
77 | setCaption( i18n("Preferences - some settings need a restart (nr)")); | 79 | setCaption( i18n("Preferences - some settings need a restart (nr)")); |
78 | mCategoryDict.setAutoDelete(true); | 80 | mCategoryDict.setAutoDelete(true); |
79 | 81 | ||
80 | KGlobal::locale()->insertCatalogue("timezones"); | 82 | KGlobal::locale()->insertCatalogue("timezones"); |
83 | mSpacingHint = spacingHintSmall(); | ||
84 | mMarginHint = marginHintSmall(); | ||
85 | #ifndef DESKTOP_VERSION | ||
86 | if ( QApplication::desktop()->height() == 480 ) | ||
87 | hideButtons(); | ||
88 | #endif | ||
81 | 89 | ||
82 | setupGlobalTab(); | 90 | setupGlobalTab(); |
83 | setupMainTab(); | 91 | setupMainTab(); |
@@ -94,10 +102,7 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | |||
94 | //setupGroupSchedulingTab(); | 102 | //setupGroupSchedulingTab(); |
95 | //setupGroupAutomationTab(); | 103 | //setupGroupAutomationTab(); |
96 | 104 | ||
97 | #ifndef DESKTOP_VERSION | 105 | |
98 | if ( QApplication::desktop()->height() == 480 ) | ||
99 | hideButtons(); | ||
100 | #endif | ||
101 | } | 106 | } |
102 | 107 | ||
103 | 108 | ||
@@ -118,8 +123,8 @@ void KOPrefsDialog::setupLocaleDateTab() | |||
118 | #if 0 | 123 | #if 0 |
119 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); | 124 | QFrame *topFrame = addPage(i18n("Date Format"),0,0); |
120 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); | 125 | QGridLayout *topLayout = new QGridLayout(topFrame,3,2); |
121 | topLayout->setSpacing(spacingHint()); | 126 | topLayout->setSpacing(mSpacingHint); |
122 | topLayout->setMargin(marginHint()); | 127 | topLayout->setMargin(mMarginHint); |
123 | int iii = 0; | 128 | int iii = 0; |
124 | 129 | ||
125 | 130 | ||
@@ -174,8 +179,8 @@ void KOPrefsDialog::setupLocaleTab() | |||
174 | #if 0 | 179 | #if 0 |
175 | QFrame *topFrame = addPage(i18n("Locale"),0,0); | 180 | QFrame *topFrame = addPage(i18n("Locale"),0,0); |
176 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 181 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
177 | topLayout->setSpacing(spacingHint()); | 182 | topLayout->setSpacing(mSpacingHint); |
178 | topLayout->setMargin(marginHint()); | 183 | topLayout->setMargin(mMarginHint); |
179 | int iii = 0; | 184 | int iii = 0; |
180 | KPrefsDialogWidRadios *syncPrefsGroup = | 185 | KPrefsDialogWidRadios *syncPrefsGroup = |
181 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); | 186 | addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame); |
@@ -246,8 +251,8 @@ void KOPrefsDialog::setupSyncAlgTab() | |||
246 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); | 251 | QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0); |
247 | mSetupSyncAlgTab = topFrame; | 252 | mSetupSyncAlgTab = topFrame; |
248 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 253 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
249 | topLayout->setSpacing(spacingHint()); | 254 | topLayout->setSpacing(mSpacingHint); |
250 | topLayout->setMargin(marginHint()); | 255 | topLayout->setMargin(mMarginHint); |
251 | int iii = 0; | 256 | int iii = 0; |
252 | 257 | ||
253 | KPrefsDialogWidBool *sb = | 258 | KPrefsDialogWidBool *sb = |
@@ -287,8 +292,8 @@ void KOPrefsDialog::setupSyncTab() | |||
287 | QLabel * lab; | 292 | QLabel * lab; |
288 | QFrame *topFrame = addPage(i18n("Sync Network"),0,0); | 293 | QFrame *topFrame = addPage(i18n("Sync Network"),0,0); |
289 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 294 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
290 | topLayout->setSpacing(spacingHint()); | 295 | topLayout->setSpacing(mSpacingHint); |
291 | topLayout->setMargin(marginHint()); | 296 | topLayout->setMargin(mMarginHint); |
292 | lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); | 297 | lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame); |
293 | int iii = 0; | 298 | int iii = 0; |
294 | topLayout->addMultiCellWidget(lab , iii,iii,0,1); | 299 | topLayout->addMultiCellWidget(lab , iii,iii,0,1); |
@@ -337,8 +342,8 @@ void KOPrefsDialog::setupMainTab() | |||
337 | // DesktopIcon("identity",KIcon::SizeMedium)); | 342 | // DesktopIcon("identity",KIcon::SizeMedium)); |
338 | 343 | ||
339 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 344 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
340 | topLayout->setSpacing(spacingHint()); | 345 | topLayout->setSpacing(mSpacingHint); |
341 | topLayout->setMargin(marginHint()); | 346 | topLayout->setMargin(mMarginHint); |
342 | 347 | ||
343 | // KPrefsDialogWidBool *emailControlCenter = | 348 | // KPrefsDialogWidBool *emailControlCenter = |
344 | // addWidBool(i18n("&Use email settings from Control Center"), | 349 | // addWidBool(i18n("&Use email settings from Control Center"), |
@@ -398,7 +403,7 @@ void KOPrefsDialog::setupMainTab() | |||
398 | // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); | 403 | // &(KOPrefs::instance()->mAutoSave),autoSaveGroup); |
399 | 404 | ||
400 | QHBox *intervalBox = new QHBox(topFrame); | 405 | QHBox *intervalBox = new QHBox(topFrame); |
401 | // intervalBox->setSpacing(spacingHint()); | 406 | // intervalBox->setSpacing(mSpacingHint); |
402 | topLayout->addMultiCellWidget(intervalBox,6,6,0,1); | 407 | topLayout->addMultiCellWidget(intervalBox,6,6,0,1); |
403 | QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); | 408 | QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox); |
404 | mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); | 409 | mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox); |
@@ -488,8 +493,8 @@ void KOPrefsDialog::setupTimeTab() | |||
488 | // DesktopIcon("clock",KIcon::SizeMedium)); | 493 | // DesktopIcon("clock",KIcon::SizeMedium)); |
489 | 494 | ||
490 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); | 495 | QGridLayout *topLayout = new QGridLayout(topFrame,4,2); |
491 | topLayout->setSpacing(spacingHint()); | 496 | topLayout->setSpacing(mSpacingHint); |
492 | topLayout->setMargin(marginHint()); | 497 | topLayout->setMargin(mMarginHint); |
493 | 498 | ||
494 | QHBox *dummy = new QHBox(topFrame); | 499 | QHBox *dummy = new QHBox(topFrame); |
495 | KPrefsDialogWidTime *dayBegins = | 500 | KPrefsDialogWidTime *dayBegins = |
@@ -561,8 +566,8 @@ void KOPrefsDialog::setupViewsTab() | |||
561 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 566 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
562 | 567 | ||
563 | QGridLayout *topLayout = new QGridLayout(topFrame,6,1); | 568 | QGridLayout *topLayout = new QGridLayout(topFrame,6,1); |
564 | topLayout->setSpacing(spacingHint()); | 569 | topLayout->setSpacing(mSpacingHint); |
565 | topLayout->setMargin(marginHint()); | 570 | topLayout->setMargin(mMarginHint); |
566 | 571 | ||
567 | // QBoxLayout *dayBeginsLayout = new QHBoxLayout; | 572 | // QBoxLayout *dayBeginsLayout = new QHBoxLayout; |
568 | // topLayout->addLayout(dayBeginsLayout,0,0); | 573 | // topLayout->addLayout(dayBeginsLayout,0,0); |
@@ -606,8 +611,8 @@ void KOPrefsDialog::setupViewsTab() | |||
606 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 611 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
607 | 612 | ||
608 | topLayout = new QGridLayout(topFrame,6,1); | 613 | topLayout = new QGridLayout(topFrame,6,1); |
609 | topLayout->setSpacing(spacingHint()); | 614 | topLayout->setSpacing(mSpacingHint); |
610 | topLayout->setMargin(marginHint()); | 615 | topLayout->setMargin(mMarginHint); |
611 | ii = 0; | 616 | ii = 0; |
612 | 617 | ||
613 | #endif | 618 | #endif |
@@ -653,20 +658,20 @@ void KOPrefsDialog::setupViewsTab() | |||
653 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); | 658 | &(KOPrefs::instance()->mWeeklyRecur),topFrame); |
654 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); | 659 | topLayout->addWidget(weeklyRecur->checkBox(),ii++,0); |
655 | 660 | ||
656 | 661 | #ifdef DESKTOP_VERSION | |
657 | KPrefsDialogWidBool *enableToolTips = | 662 | KPrefsDialogWidBool *enableToolTips = |
658 | addWidBool(i18n("Enable tooltips displaying summary of ev."), | 663 | addWidBool(i18n("Enable tooltips displaying summary of ev."), |
659 | &(KOPrefs::instance()->mEnableToolTips),topFrame); | 664 | &(KOPrefs::instance()->mEnableToolTips),topFrame); |
660 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); | 665 | topLayout->addWidget(enableToolTips->checkBox(),ii++,0); |
661 | 666 | #endif | |
662 | // ********************************************************* | 667 | // ********************************************************* |
663 | 668 | ||
664 | topFrame = addPage(i18n("Agenda View"),0,0); | 669 | topFrame = addPage(i18n("Agenda View"),0,0); |
665 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 670 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
666 | 671 | ||
667 | topLayout = new QGridLayout(topFrame,5,1); | 672 | topLayout = new QGridLayout(topFrame,5,1); |
668 | topLayout->setSpacing(spacingHint()); | 673 | topLayout->setSpacing(mSpacingHint); |
669 | topLayout->setMargin(marginHint()); | 674 | topLayout->setMargin(mMarginHint); |
670 | ii = 0; | 675 | ii = 0; |
671 | 676 | ||
672 | 677 | ||
@@ -712,8 +717,9 @@ void KOPrefsDialog::setupViewsTab() | |||
712 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 717 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
713 | 718 | ||
714 | topLayout = new QGridLayout(topFrame,5,1); | 719 | topLayout = new QGridLayout(topFrame,5,1); |
715 | topLayout->setSpacing(spacingHint()); | 720 | topLayout->setSpacing(mSpacingHint); |
716 | topLayout->setMargin(marginHint()); | 721 | topLayout->setMargin(mMarginHint); |
722 | qDebug("%d %d ",mSpacingHint, mMarginHint ); | ||
717 | ii = 0; | 723 | ii = 0; |
718 | QLabel *lab; | 724 | QLabel *lab; |
719 | QHBox *habo = new QHBox( topFrame ); | 725 | QHBox *habo = new QHBox( topFrame ); |
@@ -806,8 +812,8 @@ void KOPrefsDialog::setupViewsTab() | |||
806 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 812 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
807 | 813 | ||
808 | topLayout = new QGridLayout(topFrame,4,1); | 814 | topLayout = new QGridLayout(topFrame,4,1); |
809 | topLayout->setSpacing(spacingHint()); | 815 | topLayout->setSpacing(mSpacingHint); |
810 | topLayout->setMargin(marginHint()); | 816 | topLayout->setMargin(mMarginHint); |
811 | ii = 0; | 817 | ii = 0; |
812 | 818 | ||
813 | 819 | ||
@@ -818,7 +824,7 @@ void KOPrefsDialog::setupViewsTab() | |||
818 | topLayout->addWidget(hdummy,ii++,0); | 824 | topLayout->addWidget(hdummy,ii++,0); |
819 | 825 | ||
820 | QHBox *prioBox = new QHBox(topFrame); | 826 | QHBox *prioBox = new QHBox(topFrame); |
821 | // intervalBox->setSpacing(spacingHint()); | 827 | // intervalBox->setSpacing(mSpacingHint); |
822 | topLayout->addWidget(prioBox,ii++,0); | 828 | topLayout->addWidget(prioBox,ii++,0); |
823 | QString messa = i18n("Show topmost todo prios in What's Next:"); | 829 | QString messa = i18n("Show topmost todo prios in What's Next:"); |
824 | 830 | ||
@@ -862,8 +868,8 @@ void KOPrefsDialog::setupViewsTab() | |||
862 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 868 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
863 | 869 | ||
864 | topLayout = new QGridLayout(topFrame,4,1); | 870 | topLayout = new QGridLayout(topFrame,4,1); |
865 | topLayout->setSpacing(spacingHint()); | 871 | topLayout->setSpacing(mSpacingHint); |
866 | topLayout->setMargin(marginHint()); | 872 | topLayout->setMargin(mMarginHint); |
867 | ii = 0; | 873 | ii = 0; |
868 | dummy = | 874 | dummy = |
869 | addWidBool(i18n("Hide not running Todos in To-do view"), | 875 | addWidBool(i18n("Hide not running Todos in To-do view"), |
@@ -928,8 +934,8 @@ dummy = | |||
928 | topFrame = addPage(i18n("View Options"),0,0); | 934 | topFrame = addPage(i18n("View Options"),0,0); |
929 | 935 | ||
930 | topLayout = new QGridLayout(topFrame,4,1); | 936 | topLayout = new QGridLayout(topFrame,4,1); |
931 | topLayout->setSpacing(spacingHint()); | 937 | topLayout->setSpacing(mSpacingHint); |
932 | topLayout->setMargin(marginHint()); | 938 | topLayout->setMargin(mMarginHint); |
933 | ii = 0; | 939 | ii = 0; |
934 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); | 940 | lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame); |
935 | topLayout->addWidget(lab ,ii++,0); | 941 | topLayout->addWidget(lab ,ii++,0); |
@@ -963,8 +969,8 @@ dummy = | |||
963 | // DesktopIcon("viewmag",KIcon::SizeMedium)); | 969 | // DesktopIcon("viewmag",KIcon::SizeMedium)); |
964 | 970 | ||
965 | topLayout = new QGridLayout(topFrame,2,1); | 971 | topLayout = new QGridLayout(topFrame,2,1); |
966 | topLayout->setSpacing(spacingHint()); | 972 | topLayout->setSpacing(mSpacingHint); |
967 | topLayout->setMargin(marginHint()); | 973 | topLayout->setMargin(mMarginHint); |
968 | int iii = 0; | 974 | int iii = 0; |
969 | 975 | ||
970 | dummy = | 976 | dummy = |
@@ -1189,8 +1195,8 @@ void KOPrefsDialog::setupColorsTab() | |||
1189 | // DesktopIcon("colorize",KIcon::SizeMedium)); | 1195 | // DesktopIcon("colorize",KIcon::SizeMedium)); |
1190 | 1196 | ||
1191 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 1197 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
1192 | // topLayout->setSpacing(spacingHint()); | 1198 | // topLayout->setSpacing(mSpacingHint); |
1193 | // topLayout->setMargin(marginHint()); | 1199 | // topLayout->setMargin(mMarginHint); |
1194 | 1200 | ||
1195 | topLayout->setSpacing(2); | 1201 | topLayout->setSpacing(2); |
1196 | topLayout->setMargin(3); | 1202 | topLayout->setMargin(3); |
@@ -1298,8 +1304,8 @@ void KOPrefsDialog::setupPrinterTab() | |||
1298 | DesktopIcon("fileprint",KIcon::SizeMedium)); | 1304 | DesktopIcon("fileprint",KIcon::SizeMedium)); |
1299 | 1305 | ||
1300 | QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); | 1306 | QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2); |
1301 | topLayout->setSpacing(spacingHint()); | 1307 | topLayout->setSpacing(mSpacingHint); |
1302 | topLayout->setMargin(marginHint()); | 1308 | topLayout->setMargin(mMarginHint); |
1303 | 1309 | ||
1304 | topLayout->setRowStretch(4,1); | 1310 | topLayout->setRowStretch(4,1); |
1305 | } | 1311 | } |
@@ -1311,8 +1317,8 @@ void KOPrefsDialog::setupGroupSchedulingTab() | |||
1311 | DesktopIcon("personal",KIcon::SizeMedium)); | 1317 | DesktopIcon("personal",KIcon::SizeMedium)); |
1312 | 1318 | ||
1313 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); | 1319 | QGridLayout *topLayout = new QGridLayout(topFrame,6,2); |
1314 | topLayout->setSpacing(spacingHint()); | 1320 | topLayout->setSpacing(mSpacingHint); |
1315 | topLayout->setMargin(marginHint()); | 1321 | topLayout->setMargin(mMarginHint); |
1316 | 1322 | ||
1317 | #if 0 | 1323 | #if 0 |
1318 | KPrefsDialogWidRadios *schedulerGroup = | 1324 | KPrefsDialogWidRadios *schedulerGroup = |
@@ -1362,8 +1368,8 @@ void KOPrefsDialog::setupGroupAutomationTab() | |||
1362 | DesktopIcon("personal",KIcon::SizeMedium)); | 1368 | DesktopIcon("personal",KIcon::SizeMedium)); |
1363 | 1369 | ||
1364 | QGridLayout *topLayout = new QGridLayout(topFrame,5,1); | 1370 | QGridLayout *topLayout = new QGridLayout(topFrame,5,1); |
1365 | topLayout->setSpacing(spacingHint()); | 1371 | topLayout->setSpacing(mSpacingHint); |
1366 | topLayout->setMargin(marginHint()); | 1372 | topLayout->setMargin(mMarginHint); |
1367 | 1373 | ||
1368 | KPrefsDialogWidRadios *autoRefreshGroup = | 1374 | KPrefsDialogWidRadios *autoRefreshGroup = |
1369 | addWidRadios(i18n("Auto Send Refresh"), | 1375 | addWidRadios(i18n("Auto Send Refresh"), |
@@ -1661,8 +1667,8 @@ void KOPrefsDialog::setupTimeZoneTab() | |||
1661 | // DesktopIcon("clock",KIcon::SizeMedium)); | 1667 | // DesktopIcon("clock",KIcon::SizeMedium)); |
1662 | 1668 | ||
1663 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); | 1669 | QGridLayout *topLayout = new QGridLayout(topFrame,5,2); |
1664 | topLayout->setSpacing(spacingHint()); | 1670 | topLayout->setSpacing(mSpacingHint); |
1665 | topLayout->setMargin(marginHint()); | 1671 | topLayout->setMargin(mMarginHint); |
1666 | 1672 | ||
1667 | QHBox *timeZoneBox = new QHBox( topFrame ); | 1673 | QHBox *timeZoneBox = new QHBox( topFrame ); |
1668 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); | 1674 | topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 ); |