added 30min plus to timezone setting

3 files changed, 8 insertions, 1 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
@@ -310,32 +310,37 @@ void KDEPIMConfigWidget::setupTimeZoneTab()
   mTimeZoneCombo->insertStringList(list);
 
     // find the currently set time zone and select it
   QString sCurrentlySet = KPimGlobalPrefs::instance()->mTimeZoneId;
   int nCurrentlySet = 11;
   for (int i = 0; i < mTimeZoneCombo->count(); i++)
     {
       if (mTimeZoneCombo->text(i) == sCurrentlySet)
         {
          nCurrentlySet = i;
          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);
   ++iii;   
   lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii; 
   lab = new QLabel(  i18n("Daylight start:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mStartDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mStartDateSavingEdit, iii,1);
   ++iii;
 
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 5081b26..04e2072 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -46,32 +46,33 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
 {
 
   KPrefs::setCurrentGroup("Locale");
   addItemInt("PreferredLanguage",&mPreferredLanguage,0);
   addItemInt("PreferredTime",&mPreferredTime,0);
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
   //addItemBool("QuickSavingWOUnicode",&mUseQuicksave,false); 
   //  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
   addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
   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 );
   addItemString( "EmailChannel", &mEmailOtherChannel, "" );
   addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" );
   addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" );
   addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" );
   addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" );
 
   addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC );
   addItemString( "PhoneChannel", &mPhoneOtherChannel, "" );
   addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" );
   addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" );
@@ -105,33 +106,33 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
 
 
 void KPimGlobalPrefs::setGlobalConfig()
 {
 
     KGlobal::locale()->setHore24Format( !mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate );
     KGlobal::locale()->setLanguage( mPreferredLanguage );
     QString dummy = mUserDateFormatLong;
     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();
 }
 
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {
   if ( !sInstance ) {
     sInstance = staticDeleter.setObject( new KPimGlobalPrefs() );
     sInstance->readConfig();
   }
 
   return sInstance;
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index f6b6628..7c55099 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -83,32 +83,33 @@ class KPimGlobalPrefs : public KPrefs
 
    static KPimGlobalPrefs *sInstance;
 
 
   public:
     //US I copied the following "locale" settings from KOPrefs 
     int mPreferredDate;
     QString mUserDateFormatLong;
     QString mUserDateFormatShort;
     int mPreferredLanguage;
     int mPreferredTime;
     bool mWeekStartsOnSunday;
     QString mTimeZoneId;
     bool mUseDaylightsaving;
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
+    bool mTimeZoneAdd30min;
 
     int mEmailClient;
     QString mEmailOtherChannel;
     QString mEmailOtherMessage;
     QString mEmailOtherMessageParameters;
     QString mEmailOtherMessage2;
     QString mEmailOtherMessageParameters2;
 
     int mPhoneClient;
     QString mPhoneOtherChannel;
     QString mPhoneOtherMessage;
     QString mPhoneOtherMessageParameters;
 
     int mFaxClient;
     QString mFaxOtherChannel;
     QString mFaxOtherMessage;