| -rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 5 | ||||
| -rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 3 | ||||
| -rw-r--r-- | libkdepim/kpimglobalprefs.h | 1 | ||||
| -rw-r--r-- | microkde/kdecore/klocale.cpp | 4 | ||||
| -rw-r--r-- | microkde/kdecore/klocale.h | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 1eef150..332f975 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp @@ -325,2 +325,7 @@ void KDEPIMConfigWidget::setupTimeZoneTab() KPrefsWidBool *sb = + addWidBool(i18n("Add 30 min (+00:30) to selected Timezone"), + &(KPimGlobalPrefs::instance()->mTimeZoneAdd30min),topFrame); + topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1); + ++iii; + sb = addWidBool(i18n("Timezone has daylight saving"), diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 5081b26..04e2072 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp @@ -61,2 +61,3 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); + addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false); addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); @@ -120,3 +121,3 @@ void KPimGlobalPrefs::setGlobalConfig() mDaylightsavingEnd ); - KGlobal::locale()->setTimezone( mTimeZoneId ); + KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min ); diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index f6b6628..7c55099 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h @@ -98,2 +98,3 @@ class KPimGlobalPrefs : public KPrefs int mDaylightsavingEnd; + bool mTimeZoneAdd30min; diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp index 27acfec..673d845 100644 --- a/microkde/kdecore/klocale.cpp +++ b/microkde/kdecore/klocale.cpp @@ -821,5 +821,7 @@ QStringList KLocale::timeZoneList() const } -void KLocale::setTimezone( const QString &timeZone ) +void KLocale::setTimezone( const QString &timeZone, bool oddTZ ) { mTimeZoneOffset = timezoneOffset( timeZone ); + if ( oddTZ ) + mTimeZoneOffset += 30; } diff --git a/microkde/kdecore/klocale.h b/microkde/kdecore/klocale.h index 5783530..be9442c 100644 --- a/microkde/kdecore/klocale.h +++ b/microkde/kdecore/klocale.h @@ -97,3 +97,3 @@ class KLocale int localTimeOffset(const QDateTime &); - void setTimezone( const QString &timeZone ); + void setTimezone( const QString &timeZone , bool oddTZ); private: |