author | zautrix <zautrix> | 2005-04-13 23:54:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-13 23:54:32 (UTC) |
commit | 5ea16ef9058a21016402dd5affc0a7f82857e606 (patch) (unidiff) | |
tree | 3c147e24c3bd51208a8055a94e4a487a1708d337 /libkdepim | |
parent | 93b536533e1c908085adb61553907615c31786c0 (diff) | |
download | kdepimpi-5ea16ef9058a21016402dd5affc0a7f82857e606.zip kdepimpi-5ea16ef9058a21016402dd5affc0a7f82857e606.tar.gz kdepimpi-5ea16ef9058a21016402dd5affc0a7f82857e606.tar.bz2 |
fix
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 11 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 5 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index d62d9f9..759b29d 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp | |||
@@ -117,6 +117,17 @@ void KDEPIMConfigWidget::showTimeZoneTab() | |||
117 | } | 117 | } |
118 | void KDEPIMConfigWidget::setupStoreTab() | 118 | void KDEPIMConfigWidget::setupStoreTab() |
119 | { | 119 | { |
120 | QVBox *colorPage = new QVBox( this ); | ||
121 | tabWidget->addTab( colorPage, i18n( "Colors" ) ); | ||
122 | QWidget* cw = new QWidget( colorPage ); | ||
123 | KPrefsWidColor *holidayColor = | ||
124 | addWidColor(i18n("Alternate background"), | ||
125 | &(KPimGlobalPrefs::instance()->mAlternateColor),cw); | ||
126 | QHBoxLayout *topLayout = new QHBoxLayout(cw); | ||
127 | topLayout->addWidget(holidayColor->label()); | ||
128 | topLayout->addWidget( (QWidget* )holidayColor->button()); | ||
129 | |||
130 | |||
120 | QVBox *storePage = new QVBox( this ); | 131 | QVBox *storePage = new QVBox( this ); |
121 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); | 132 | new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage ); |
122 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); | 133 | new QLabel( i18n("<b>New data storage dir:</b>"), storePage ); |
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index a09b278..873f0eb 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp | |||
@@ -60,6 +60,10 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) | |||
60 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%AK %d. %b %y"); | 60 | addItemString("UserDateFormatLong", &mUserDateFormatLong, "%AK %d. %b %y"); |
61 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); | 61 | addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y"); |
62 | 62 | ||
63 | KPrefs::setCurrentGroup("Colors"); | ||
64 | addItemColor("AlternateBGcolor",&mAlternateColor,KGlobalSettings::alternateBackgroundColor()); | ||
65 | |||
66 | |||
63 | KPrefs::setCurrentGroup("Time & Date"); | 67 | KPrefs::setCurrentGroup("Time & Date"); |
64 | 68 | ||
65 | addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") ); | 69 | addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") ); |
@@ -188,6 +192,7 @@ void KPimGlobalPrefs::setGlobalConfig() | |||
188 | mDaylightsavingStart, | 192 | mDaylightsavingStart, |
189 | mDaylightsavingEnd ); | 193 | mDaylightsavingEnd ); |
190 | KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min ); | 194 | KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min ); |
195 | KGlobalSettings::setAlternateBackgroundColor(mAlternateColor); | ||
191 | 196 | ||
192 | } | 197 | } |
193 | KPimGlobalPrefs::~KPimGlobalPrefs() | 198 | KPimGlobalPrefs::~KPimGlobalPrefs() |
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index bf17338..36cc25a 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h | |||
@@ -102,6 +102,7 @@ class KPimGlobalPrefs : public KPrefs | |||
102 | int mDaylightsavingEnd; | 102 | int mDaylightsavingEnd; |
103 | bool mTimeZoneAdd30min; | 103 | bool mTimeZoneAdd30min; |
104 | QFont mApplicationFont; | 104 | QFont mApplicationFont; |
105 | QColor mAlternateColor; | ||
105 | 106 | ||
106 | int mEmailClient; | 107 | int mEmailClient; |
107 | QString mEmailOtherChannel; | 108 | QString mEmailOtherChannel; |