| -rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 33 |
1 files changed, 28 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 @@ -41,6 +41,7 @@ $Id$ #include <qregexp.h> #include <kdialog.h> +#include <kprefsdialog.h> #include <klocale.h> #include <kdateedit.h> #include <kglobal.h> @@ -81,6 +82,7 @@ $Id$ #include "kpimglobalprefs.h" #include "kdepimconfigwidget.h" +#include <kprefs.h> KDEPIMConfigWidget::KDEPIMConfigWidget(KPimGlobalPrefs *prefs, QWidget *parent, const char *name ) @@ -348,8 +350,16 @@ void KDEPIMConfigWidget::setupLocaleTab() void KDEPIMConfigWidget::setupTimeZoneTab() { - QWidget *topFrame = new QWidget( this ); - QGridLayout *topLayout = new QGridLayout( topFrame, 5, 2); + QWidget *topFrame; + QGridLayout *topLayout ; + + + + + + + topFrame = new QWidget( this ); + topLayout = new QGridLayout( topFrame, 5, 2); topLayout->setSpacing(KDialog::spacingHintSmall()); topLayout->setMargin(KDialog::marginHintSmall()); @@ -416,11 +426,24 @@ void KDEPIMConfigWidget::setupTimeZoneTab() connect( mStartDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); connect( mEndDateSavingEdit, SIGNAL( dateChanged(QDate)), this, SLOT( modified()) ); connect( mTimeZoneCombo, SIGNAL( activated( int ) ), this, SLOT (modified() ) ); - - - tabWidget->addTab( topFrame, i18n( "Time Zone" ) ); + + topFrame = new QWidget( this ); + topLayout = new QGridLayout( topFrame, 3, 2); + topLayout->setSpacing(KDialog::spacingHintSmall()); + topLayout->setMargin(KDialog::marginHintSmall()); + tabWidget->addTab( topFrame, i18n( "Fonts" ) ); + + QLabel* labb = new QLabel( i18n("Global application font for all apps:"), topFrame ); + topLayout->addMultiCellWidget(labb,0,0,0,2); + int i = 1; + KPrefsWidFont *timeLabelsFont = + addWidFont(i18n("Kx/Pi"),i18n("Application Font"), + &(KPimGlobalPrefs::instance()->mApplicationFont),topFrame); + topLayout->addWidget(timeLabelsFont->label(),i,0); + topLayout->addWidget(timeLabelsFont->preview(),i,1); + topLayout->addWidget(timeLabelsFont->button(),i,2); } void KDEPIMConfigWidget::externalapp_changed( int newApp ) |