Diffstat (limited to 'kmicromail/koprefsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/koprefsdialog.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 40347cc..9cde5cf 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -24,78 +24,80 @@ | |||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | #include <qlabel.h> | 25 | #include <qlabel.h> |
26 | #include <qgroupbox.h> | 26 | #include <qgroupbox.h> |
27 | #include <qbuttongroup.h> | 27 | #include <qbuttongroup.h> |
28 | #include <qlineedit.h> | 28 | #include <qlineedit.h> |
29 | #include <qfont.h> | 29 | #include <qfont.h> |
30 | #include <qslider.h> | 30 | #include <qslider.h> |
31 | #include <qfile.h> | 31 | #include <qfile.h> |
32 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
33 | #include <qcombobox.h> | 33 | #include <qcombobox.h> |
34 | #include <qvbox.h> | 34 | #include <qvbox.h> |
35 | #include <qhbox.h> | 35 | #include <qhbox.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | #include <qspinbox.h> | 37 | #include <qspinbox.h> |
38 | #include <qdatetime.h> | 38 | #include <qdatetime.h> |
39 | #include <qcheckbox.h> | 39 | #include <qcheckbox.h> |
40 | #include <qradiobutton.h> | 40 | #include <qradiobutton.h> |
41 | #include <qpushbutton.h> | 41 | #include <qpushbutton.h> |
42 | #include <qstrlist.h> | 42 | #include <qstrlist.h> |
43 | #include <qapplication.h> | 43 | #include <qapplication.h> |
44 | 44 | ||
45 | #include <kcolorbutton.h> | 45 | #include <kcolorbutton.h> |
46 | #include <kdebug.h> | 46 | #include <kdebug.h> |
47 | #include <klocale.h> | 47 | #include <klocale.h> |
48 | #include <kglobal.h> | 48 | #include <kglobal.h> |
49 | #include <kfontdialog.h> | 49 | #include <kfontdialog.h> |
50 | #include <kfiledialog.h> | 50 | #include <kfiledialog.h> |
51 | #include <kmessagebox.h> | 51 | #include <kmessagebox.h> |
52 | #include <kcolordialog.h> | 52 | #include <kcolordialog.h> |
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 <klineedit.h> | 58 | #include <klineedit.h> |
58 | 59 | ||
59 | 60 | ||
60 | #include "koprefs.h" | 61 | #include "koprefs.h" |
61 | 62 | ||
62 | #include "koprefsdialog.h" | 63 | #include "koprefsdialog.h" |
63 | //#include <kprefswidget.h> | 64 | //#include <kprefswidget.h> |
64 | 65 | ||
65 | 66 | ||
66 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : | 67 | KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : |
67 | KPrefsDialog(KOPrefs::instance(),parent,name,true) | 68 | KPrefsDialog(KOPrefs::instance(),parent,name,true) |
68 | { | 69 | { |
69 | 70 | ||
71 | setFont( KGlobalSettings::generalFont() ); | ||
70 | setCaption( i18n("Settings - some need a restart (nr)")); | 72 | setCaption( i18n("Settings - some need a restart (nr)")); |
71 | setupGlobalTab(); | 73 | setupGlobalTab(); |
72 | setupMainTab(); | 74 | setupMainTab(); |
73 | setupMailTab();; | 75 | setupMailTab();; |
74 | setupFontsTab(); | 76 | setupFontsTab(); |
75 | readConfig(); | 77 | readConfig(); |
76 | #ifndef DESKTOP_VERSION | 78 | #ifndef DESKTOP_VERSION |
77 | if ( QApplication::desktop()->height() == 480 ) | 79 | if ( QApplication::desktop()->height() == 480 ) |
78 | hideButtons(); | 80 | hideButtons(); |
79 | #endif | 81 | #endif |
80 | 82 | ||
81 | #if 0 | 83 | #if 0 |
82 | 84 | ||
83 | setupMainTab(); | 85 | setupMainTab(); |
84 | setupLocaleTab(); | 86 | setupLocaleTab(); |
85 | setupTimeZoneTab(); | 87 | setupTimeZoneTab(); |
86 | setupTimeTab(); | 88 | setupTimeTab(); |
87 | setupLocaleDateTab(); | 89 | setupLocaleDateTab(); |
88 | setupFontsTab(); | 90 | setupFontsTab(); |
89 | setupColorsTab(); | 91 | setupColorsTab(); |
90 | setupViewsTab(); | 92 | setupViewsTab(); |
91 | //setupSyncTab(); | 93 | //setupSyncTab(); |
92 | //setupSyncAlgTab(); | 94 | //setupSyncAlgTab(); |
93 | //setupPrinterTab(); | 95 | //setupPrinterTab(); |
94 | //setupGroupSchedulingTab(); | 96 | //setupGroupSchedulingTab(); |
95 | //setupGroupAutomationTab(); | 97 | //setupGroupAutomationTab(); |
96 | #endif | 98 | #endif |
97 | } | 99 | } |
98 | 100 | ||
99 | #include "kpimglobalprefs.h" | 101 | #include "kpimglobalprefs.h" |
100 | 102 | ||
101 | KOPrefsDialog::~KOPrefsDialog() | 103 | KOPrefsDialog::~KOPrefsDialog() |