summaryrefslogtreecommitdiffabout
path: root/korganizer/koprefs.h
Unidiff
Diffstat (limited to 'korganizer/koprefs.h') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.h25
1 files changed, 15 insertions, 10 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index a9ac52f..33eda60 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -96,12 +96,8 @@ class KOPrefs : public KPimPrefs
96 int mMailClient; 96 int mMailClient;
97 97
98 QString mTimeZone; 98 QString mTimeZone;
99 QString mTimeZoneId;
100 //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius 99 //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius
101 //int mTimeZoneOffset; // e.g. -240 min 100 //int mTimeZoneOffset; // e.g. -240 min
102 bool mUseDaylightsaving;
103 int mDaylightsavingStart;
104 int mDaylightsavingEnd;
105 int mStartTime; 101 int mStartTime;
106 int mDefaultDuration; 102 int mDefaultDuration;
107 int mAlarmTime; 103 int mAlarmTime;
@@ -270,14 +266,8 @@ class KOPrefs : public KPimPrefs
270 bool mMonthViewUsesForegroundColor; 266 bool mMonthViewUsesForegroundColor;
271 267
272 bool mHightlightDateTimeEdit; 268 bool mHightlightDateTimeEdit;
273 int mPreferredLanguage;
274 bool mUseQuicksave; 269 bool mUseQuicksave;
275 int mPreferredTime;
276 int mPreferredDate;
277 bool mWeekStartsOnSunday;
278 bool mShortDateInViewer; 270 bool mShortDateInViewer;
279 QString mUserDateFormatLong;
280 QString mUserDateFormatShort;
281 271
282 QStringList mLocationDefaults; 272 QStringList mLocationDefaults;
283 QStringList mEventSummaryUser; 273 QStringList mEventSummaryUser;
@@ -289,6 +279,21 @@ class KOPrefs : public KPimPrefs
289 int mAlarmSuspendCount; 279 int mAlarmSuspendCount;
290 int mAlarmBeepInterval; 280 int mAlarmBeepInterval;
291 281
282
283 //US I copied the following settings into KPimGlobalPrefs
284 // that allows us later to easily remove the settings from here.
285 int mPreferredDate;
286 QString mUserDateFormatLong;
287 QString mUserDateFormatShort;
288 int mPreferredLanguage;
289 int mPreferredTime;
290 bool mWeekStartsOnSunday;
291 QString mTimeZoneId;
292 bool mUseDaylightsaving;
293 int mDaylightsavingStart;
294 int mDaylightsavingEnd;
295
296
292 private: 297 private:
293 QDict<QColor> mCategoryColors; 298 QDict<QColor> mCategoryColors;
294 QColor mDefaultCategoryColor; 299 QColor mDefaultCategoryColor;