added 30min plus to timezone setting

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
@@ -320,12 +320,17 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
          break;
         }
     }
   mTimeZoneCombo->setCurrentItem(nCurrentlySet);
   int iii = 1;
   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"),
                  &(KPimGlobalPrefs::instance()->mUseDaylightsaving),topFrame);
   topLayout->addMultiCellWidget((QWidget*)sb->checkBox(), iii,iii,0,1);
   ++iii;  
   QLabel* lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 5081b26..04e2072 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -56,12 +56,13 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
   KPrefs::setCurrentGroup("Time & Date");
 
   addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") );
   addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
+  addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false);
   addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
   addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
 
   KPrefs::setCurrentGroup( "ExternalApplications" );
 
   addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC );
@@ -115,13 +116,13 @@ void KPimGlobalPrefs::setGlobalConfig()
     KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
     dummy = mUserDateFormatShort;
     KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
     KGlobal::locale()->setDaylightSaving( mUseDaylightsaving,
                                           mDaylightsavingStart,
                                           mDaylightsavingEnd );
-    KGlobal::locale()->setTimezone( mTimeZoneId );
+    KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min );
 
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
 { 
     //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
     writeConfig();
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index f6b6628..7c55099 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -93,12 +93,13 @@ class KPimGlobalPrefs : public KPrefs
     int mPreferredTime;
     bool mWeekStartsOnSunday;
     QString mTimeZoneId;
     bool mUseDaylightsaving;
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
+    bool mTimeZoneAdd30min;
 
     int mEmailClient;
     QString mEmailOtherChannel;
     QString mEmailOtherMessage;
     QString mEmailOtherMessageParameters;
     QString mEmailOtherMessage2;
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
@@ -816,15 +816,17 @@ int KLocale::timezoneOffset( QString timeZone )
 }
 
 QStringList KLocale::timeZoneList() const
 {
     return mTimeZoneList;
 }
-void KLocale::setTimezone( const QString &timeZone )
+void KLocale::setTimezone( const QString &timeZone, bool oddTZ )
 {
     mTimeZoneOffset = timezoneOffset( timeZone );
+    if ( oddTZ )
+        mTimeZoneOffset += 30;
 }
 
 void KLocale::setDaylightSaving( bool b, int start , int end )
 {
     daylightEnabled = b;
     daylightStart = start;
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
@@ -92,13 +92,13 @@ class KLocale
   QString m_negativeSign;
 
     int timezoneOffset( QString );
     QStringList timeZoneList() const;
     void setDaylightSaving( bool, int , int );
     int localTimeOffset(const QDateTime &);
-    void setTimezone( const QString &timeZone );
+    void setTimezone( const QString &timeZone , bool oddTZ);
   private:
     QTime readTime(const QString &str, bool seconds, bool *ok) const;
     QDate readDate(const QString &str, bool shortFormat, bool *ok) const;
     KCalendarSystem *mCalendarSystem;
     bool mWeekStartsMonday;
     bool mHourF24Format;