-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 4 | ||||
-rw-r--r-- | kmicromail/koprefsdialog.cpp | 4 | ||||
-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 986c9b8..8a4dd3d 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp | |||
@@ -52,12 +52,13 @@ | |||
52 | #include "addresseewidget.h" | 52 | #include "addresseewidget.h" |
53 | #include "extensionconfigdialog.h" | 53 | #include "extensionconfigdialog.h" |
54 | #include "extensionwidget.h" | 54 | #include "extensionwidget.h" |
55 | #include "kabprefs.h" | 55 | #include "kabprefs.h" |
56 | 56 | ||
57 | #include "kabconfigwidget.h" | 57 | #include "kabconfigwidget.h" |
58 | #include <kglobalsettings.h> | ||
58 | 59 | ||
59 | class ExtensionItem : public QCheckListItem | 60 | class ExtensionItem : public QCheckListItem |
60 | { | 61 | { |
61 | public: | 62 | public: |
62 | 63 | ||
63 | #ifndef KAB_EMBEDDED | 64 | #ifndef KAB_EMBEDDED |
@@ -85,14 +86,15 @@ class ExtensionItem : public QCheckListItem | |||
85 | 86 | ||
86 | }; | 87 | }; |
87 | 88 | ||
88 | KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name ) | 89 | KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name ) |
89 | : KPrefsWidget( prefs, parent, name ) | 90 | : KPrefsWidget( prefs, parent, name ) |
90 | { | 91 | { |
92 | |||
91 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, | 93 | QVBoxLayout *topLayout = new QVBoxLayout( this, 0, |
92 | KDialog::spacingHint() ); | 94 | KDialog::spacingHintSmall() ); |
93 | 95 | ||
94 | QTabWidget *tabWidget = new QTabWidget( this ); | 96 | QTabWidget *tabWidget = new QTabWidget( this ); |
95 | topLayout->addWidget( tabWidget ); | 97 | topLayout->addWidget( tabWidget ); |
96 | 98 | ||
97 | // General page | 99 | // General page |
98 | QWidget *generalPage = new QWidget( this ); | 100 | QWidget *generalPage = new QWidget( this ); |
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp index 40347cc..9cde5cf 100644 --- a/kmicromail/koprefsdialog.cpp +++ b/kmicromail/koprefsdialog.cpp | |||
@@ -50,12 +50,13 @@ | |||
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 | ||
@@ -63,13 +64,14 @@ | |||
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(); |
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index 4daa4ff..bb41b18 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp | |||
@@ -29,21 +29,23 @@ | |||
29 | #include <kdebug.h> | 29 | #include <kdebug.h> |
30 | #include <kiconloader.h> | 30 | #include <kiconloader.h> |
31 | #include <kmessagebox.h> | 31 | #include <kmessagebox.h> |
32 | //US #include <klibloader.h> | 32 | //US #include <klibloader.h> |
33 | #include <krun.h> | 33 | #include <krun.h> |
34 | #include <kprocess.h> | 34 | #include <kprocess.h> |
35 | #include <kglobalsettings.h> | ||
35 | 36 | ||
36 | #include "kcmultidialog.h" | 37 | #include "kcmultidialog.h" |
37 | //US #include "kcmultidialog.moc" | 38 | //US #include "kcmultidialog.moc" |
38 | //US #include "kcmoduleloader.h" | 39 | //US #include "kcmoduleloader.h" |
39 | 40 | ||
40 | KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) | 41 | KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) |
41 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, | 42 | : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, |
42 | parent, name, modal, true), d(0L) | 43 | parent, name, modal, true), d(0L) |
43 | { | 44 | { |
45 | setFont( KGlobalSettings::generalFont() ); | ||
44 | enableButton(Apply, false); | 46 | enableButton(Apply, false); |
45 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); | 47 | //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); |
46 | 48 | ||
47 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); | 49 | connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); |
48 | 50 | ||
49 | _baseGroup = baseGroup; | 51 | _baseGroup = baseGroup; |