author | zautrix <zautrix> | 2005-02-11 05:36:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-11 05:36:14 (UTC) |
commit | 0c1191e3253542b4858261241975c159ee7910c6 (patch) (unidiff) | |
tree | be97b6665d130f0b72db82005726fbf7cc030abb /libkdepim | |
parent | 38c6a7b6ae1e98cba0fdf2d0fba59ad4b9060940 (diff) | |
download | kdepimpi-0c1191e3253542b4858261241975c159ee7910c6.zip kdepimpi-0c1191e3253542b4858261241975c159ee7910c6.tar.gz kdepimpi-0c1191e3253542b4858261241975c159ee7910c6.tar.bz2 |
font fixes
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 33 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 3 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 1 |
3 files changed, 32 insertions, 5 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 6eaf2f2..bbed38d 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -42,4 +42,5 @@ $Id$ | |||
42 | 42 | ||
43 | #include <kdialog.h> | 43 | #include <kdialog.h> |
44 | #include <kprefsdialog.h> | ||
44 | #include <klocale.h> | 45 | #include <klocale.h> |
45 | #include <kdateedit.h> | 46 | #include <kdateedit.h> |
@@ -82,4 +83,5 @@ $Id$ | |||
82 | 83 | ||
83 | #include "kdepimconfigwidget.h" | 84 | #include "kdepimconfigwidget.h" |
85 | #include <kprefs.h> | ||
84 | 86 | ||
85 | 87 | ||
@@ -349,6 +351,14 @@ void KDEPIMConfigWidget::setupLocaleTab() | |||
349 | void KDEPIMConfigWidget::setupTimeZoneTab() | 351 | void KDEPIMConfigWidget::setupTimeZoneTab() |
350 | { | 352 | { |
351 | QWidget *topFrame = new QWidget( this ); | 353 | QWidget *topFrame; |
352 | QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); | 354 | QGridLayout *topLayout ; |
355 | |||
356 | |||
357 | |||
358 | |||
359 | |||
360 | |||
361 | topFrame = new QWidget( this ); | ||
362 | topLayout = new QGridLayout( topFrame, 5, 2); | ||
353 | topLayout->setSpacing(KDialog::spacingHintSmall()); | 363 | topLayout->setSpacing(KDialog::spacingHintSmall()); |
354 | topLayout->setMargin(KDialog::marginHintSmall()); | 364 | topLayout->setMargin(KDialog::marginHintSmall()); |
@@ -417,9 +427,22 @@ void KDEPIMConfigWidget::setupTimeZoneTab() | |||
417 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); | 427 | connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); |
418 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); | 428 | connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); |
419 | |||
420 | |||
421 | |||
422 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); | 429 | tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); |
423 | 430 | ||
431 | |||
432 | topFrame = new QWidget( this ); | ||
433 | topLayout = new QGridLayout( topFrame, 3, 2); | ||
434 | topLayout->setSpacing(KDialog::spacingHintSmall()); | ||
435 | topLayout->setMargin(KDialog::marginHintSmall()); | ||
436 | tabWidget->addTab( topFrame, i18n( "Fonts" ) ); | ||
437 | |||
438 | QLabel* labb = new QLabel( i18n("Global application font for all apps:"), topFrame ); | ||
439 | topLayout->addMultiCellWidget(labb,0,0,0,2); | ||
440 | int i = 1; | ||
441 | KPrefsWidFont *timeLabelsFont = | ||
442 | addWidFont(i18n("Kx/Pi"),i18n("Application Font"), | ||
443 | &(KPimGlobalPrefs::instance()->mApplicationFont),topFrame); | ||
444 | topLayout->addWidget(timeLabelsFont->label(),i,0); | ||
445 | topLayout->addWidget(timeLabelsFont->preview(),i,1); | ||
446 | topLayout->addWidget(timeLabelsFont->button(),i,2); | ||
424 | } | 447 | } |
425 | 448 | ||
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 81e3cb1..ac7d205 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -33,4 +33,5 @@ $Id$ | |||
33 | #include <klocale.h> | 33 | #include <klocale.h> |
34 | #include <kdebug.h> | 34 | #include <kdebug.h> |
35 | #include <kglobalsettings.h> | ||
35 | #include <kstaticdeleter.h> | 36 | #include <kstaticdeleter.h> |
36 | 37 | ||
@@ -50,4 +51,6 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | |||
50 | { | 51 | { |
51 | mLocaleDict = 0; | 52 | mLocaleDict = 0; |
53 | KPrefs::setCurrentGroup("Fonts"); | ||
54 | addItemFont("ApplicationFont",&mApplicationFont,KGlobalSettings::generalFont() ); | ||
52 | KPrefs::setCurrentGroup("Locale"); | 55 | KPrefs::setCurrentGroup("Locale"); |
53 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); | 56 | addItemInt("PreferredLanguage",&mPreferredLanguage,0); |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index 5e27e85..bf17338 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -102,4 +102,5 @@ class KPimGlobalPrefs : public KPrefs | |||
102 | int mDaylightsavingEnd; | 102 | int mDaylightsavingEnd; |
103 | bool mTimeZoneAdd30min; | 103 | bool mTimeZoneAdd30min; |
104 | QFont mApplicationFont; | ||
104 | 105 | ||
105 | int mEmailClient; | 106 | int mEmailClient; |