Diffstat (limited to 'kmicromail/settingsdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kmicromail/settingsdialog.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kmicromail/settingsdialog.cpp b/kmicromail/settingsdialog.cpp index c593b48..889c490 100644 --- a/kmicromail/settingsdialog.cpp +++ b/kmicromail/settingsdialog.cpp | |||
@@ -1,53 +1,55 @@ | |||
1 | #include <qcheckbox.h> | 1 | #include <qcheckbox.h> |
2 | #include <qspinbox.h> | 2 | #include <qspinbox.h> |
3 | #include <qlayout.h> | 3 | #include <qlayout.h> |
4 | #include <qtabwidget.h> | 4 | #include <qtabwidget.h> |
5 | //Added by qt3to4: | ||
6 | #include <Q3GridLayout> | ||
5 | 7 | ||
6 | #include <kconfig.h> | 8 | #include <kconfig.h> |
7 | #include <kprefs.h> | 9 | #include <kprefs.h> |
8 | #include <klocale.h> | 10 | #include <klocale.h> |
9 | #include <kglobal.h> | 11 | #include <kglobal.h> |
10 | #include <kfontdialog.h> | 12 | #include <kfontdialog.h> |
11 | 13 | ||
12 | #include "settingsdialog.h" | 14 | #include "settingsdialog.h" |
13 | 15 | ||
14 | 16 | ||
15 | SettingsDialog::SettingsDialog( QWidget* parent, const char* name, bool modal, WFlags fl ) | 17 | SettingsDialog::SettingsDialog( QWidget* parent, const char* name, bool modal, Qt::WFlags fl ) |
16 | : SettingsDialogUI( parent, name, modal, fl ) { | 18 | : SettingsDialogUI( parent, name, modal, fl ) { |
17 | 19 | ||
18 | #if 0 | 20 | #if 0 |
19 | QTabWidget *topFrame = TabWidget2; | 21 | QTabWidget *topFrame = TabWidget2; |
20 | 22 | ||
21 | QGridLayout *topLayout = new QGridLayout(topFrame,3,3); | 23 | Q3GridLayout *topLayout = new Q3GridLayout(topFrame,3,3); |
22 | topLayout->setSpacing(2); | 24 | topLayout->setSpacing(2); |
23 | topLayout->setMargin(3); | 25 | topLayout->setMargin(3); |
24 | KPrefsWidFont * tVFont; | 26 | KPrefsWidFont * tVFont; |
25 | int i = 0; | 27 | int i = 0; |
26 | KPrefsWidFont *timeLabelsFont = | 28 | KPrefsWidFont *timeLabelsFont = |
27 | addWidFont(i18n("OK"),i18n("Application(nr):"), | 29 | addWidFont(i18n("OK"),i18n("Application(nr):"), |
28 | &(mAppFont),topFrame); | 30 | &(mAppFont),topFrame); |
29 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 31 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
30 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 32 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
31 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 33 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
32 | ++i; | 34 | ++i; |
33 | 35 | ||
34 | 36 | ||
35 | timeLabelsFont = | 37 | timeLabelsFont = |
36 | addWidFont(i18n("Mon 15"),i18n("Compose Mail:"), | 38 | addWidFont(i18n("Mon 15"),i18n("Compose Mail:"), |
37 | &(mComposeFont),topFrame); | 39 | &(mComposeFont),topFrame); |
38 | topLayout->addWidget(timeLabelsFont->label(),i,0); | 40 | topLayout->addWidget(timeLabelsFont->label(),i,0); |
39 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | 41 | topLayout->addWidget(timeLabelsFont->preview(),i,1); |
40 | topLayout->addWidget(timeLabelsFont->button(),i,2); | 42 | topLayout->addWidget(timeLabelsFont->button(),i,2); |
41 | ++i; | 43 | ++i; |
42 | 44 | ||
43 | KPrefsWidFont *timeBarFont = | 45 | KPrefsWidFont *timeBarFont = |
44 | addWidFont(i18n("Mon 15"),i18n("Read Mail:"), | 46 | addWidFont(i18n("Mon 15"),i18n("Read Mail:"), |
45 | &(mReadFont),topFrame); | 47 | &(mReadFont),topFrame); |
46 | topLayout->addWidget(timeBarFont->label(),i,0); | 48 | topLayout->addWidget(timeBarFont->label(),i,0); |
47 | topLayout->addWidget(timeBarFont->preview(),i,1); | 49 | topLayout->addWidget(timeBarFont->preview(),i,1); |
48 | topLayout->addWidget(timeBarFont->button(),i,2); | 50 | topLayout->addWidget(timeBarFont->button(),i,2); |
49 | ++i; | 51 | ++i; |
50 | 52 | ||
51 | readConfig(); | 53 | readConfig(); |
52 | #endif | 54 | #endif |
53 | } | 55 | } |