author | zautrix <zautrix> | 2004-10-22 22:10:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-22 22:10:16 (UTC) |
commit | b8da6435b8e5941eb1824873e68d8a6a728fae5e (patch) (unidiff) | |
tree | bc5ed11961e89bcd606f6fbca32185dbf8afab7a /korganizer | |
parent | a5274f27dc71e1a0ffae73f32f84f4dd013b4b76 (diff) | |
download | kdepimpi-b8da6435b8e5941eb1824873e68d8a6a728fae5e.zip kdepimpi-b8da6435b8e5941eb1824873e68d8a6a728fae5e.tar.gz kdepimpi-b8da6435b8e5941eb1824873e68d8a6a728fae5e.tar.bz2 |
fixed an ugly timezone bug
-rw-r--r-- | korganizer/calendarview.cpp | 12 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 5 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 13 | ||||
-rw-r--r-- | korganizer/koprefs.h | 9 |
4 files changed, 10 insertions, 29 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 0306e07..e64d83a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1199,7 +1199,7 @@ bool CalendarView::syncCalendar(QString filename, int mode) | |||
1199 | //qDebug("syncCalendar %s ", filename.latin1()); | 1199 | //qDebug("syncCalendar %s ", filename.latin1()); |
1200 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1200 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1201 | CalendarLocal* calendar = new CalendarLocal(); | 1201 | CalendarLocal* calendar = new CalendarLocal(); |
1202 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1202 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
1203 | FileStorage* storage = new FileStorage( calendar ); | 1203 | FileStorage* storage = new FileStorage( calendar ); |
1204 | bool syncOK = false; | 1204 | bool syncOK = false; |
1205 | storage->setFileName( filename ); | 1205 | storage->setFileName( filename ); |
@@ -1230,7 +1230,7 @@ void CalendarView::syncExternal( int mode ) | |||
1230 | 1230 | ||
1231 | qApp->processEvents(); | 1231 | qApp->processEvents(); |
1232 | CalendarLocal* calendar = new CalendarLocal(); | 1232 | CalendarLocal* calendar = new CalendarLocal(); |
1233 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1233 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
1234 | bool syncOK = false; | 1234 | bool syncOK = false; |
1235 | bool loadSuccess = false; | 1235 | bool loadSuccess = false; |
1236 | PhoneFormat* phoneFormat = 0; | 1236 | PhoneFormat* phoneFormat = 0; |
@@ -1498,7 +1498,7 @@ bool CalendarView::importQtopia( const QString &categories, | |||
1498 | edit_sync_options(); | 1498 | edit_sync_options(); |
1499 | qApp->processEvents(); | 1499 | qApp->processEvents(); |
1500 | CalendarLocal* calendar = new CalendarLocal(); | 1500 | CalendarLocal* calendar = new CalendarLocal(); |
1501 | calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 1501 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
1502 | bool syncOK = false; | 1502 | bool syncOK = false; |
1503 | QtopiaFormat qtopiaFormat; | 1503 | QtopiaFormat qtopiaFormat; |
1504 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); | 1504 | qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories)); |
@@ -2001,7 +2001,7 @@ void CalendarView::writeLocale() | |||
2001 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, | 2001 | KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving, |
2002 | KOPrefs::instance()->mDaylightsavingStart, | 2002 | KOPrefs::instance()->mDaylightsavingStart, |
2003 | KOPrefs::instance()->mDaylightsavingEnd ); | 2003 | KOPrefs::instance()->mDaylightsavingEnd ); |
2004 | KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); | 2004 | KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId ); |
2005 | #endif | 2005 | #endif |
2006 | } | 2006 | } |
2007 | void CalendarView::updateConfig() | 2007 | void CalendarView::updateConfig() |
@@ -2012,7 +2012,7 @@ void CalendarView::updateConfig() | |||
2012 | emit configChanged(); | 2012 | emit configChanged(); |
2013 | mTodoList->updateConfig(); | 2013 | mTodoList->updateConfig(); |
2014 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); | 2014 | // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); |
2015 | mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 2015 | mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
2016 | // To make the "fill window" configurations work | 2016 | // To make the "fill window" configurations work |
2017 | //mViewManager->raiseCurrentView(); | 2017 | //mViewManager->raiseCurrentView(); |
2018 | } | 2018 | } |
@@ -2320,7 +2320,7 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) | |||
2320 | if ( beamDialog->beamLocal() ) | 2320 | if ( beamDialog->beamLocal() ) |
2321 | cal->setLocalTime(); | 2321 | cal->setLocalTime(); |
2322 | else | 2322 | else |
2323 | cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 2323 | cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
2324 | Incidence *incidence = delSel.first(); | 2324 | Incidence *incidence = delSel.first(); |
2325 | bool addText = false; | 2325 | bool addText = false; |
2326 | if ( delSel.count() < 10 ) | 2326 | if ( delSel.count() < 10 ) |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index bafd349..d3aa650 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -39,6 +39,7 @@ | |||
39 | #include <kiconloader.h> | 39 | #include <kiconloader.h> |
40 | #include <kglobal.h> | 40 | #include <kglobal.h> |
41 | 41 | ||
42 | #include <libkdepim/kpimglobalprefs.h> | ||
42 | #include <libkcal/calendar.h> | 43 | #include <libkcal/calendar.h> |
43 | #include <libkcal/calendarlocal.h> | 44 | #include <libkcal/calendarlocal.h> |
44 | #include <libkcal/icalformat.h> | 45 | #include <libkcal/icalformat.h> |
@@ -377,7 +378,7 @@ void KOListView::beamSelected() | |||
377 | if ( createbup ) { | 378 | if ( createbup ) { |
378 | QString description = "\n"; | 379 | QString description = "\n"; |
379 | CalendarLocal* cal = new CalendarLocal(); | 380 | CalendarLocal* cal = new CalendarLocal(); |
380 | cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 381 | cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
381 | Incidence *incidence = delSel.first(); | 382 | Incidence *incidence = delSel.first(); |
382 | while ( incidence ) { | 383 | while ( incidence ) { |
383 | Incidence *in = incidence->clone(); | 384 | Incidence *in = incidence->clone(); |
@@ -528,7 +529,7 @@ void KOListView::saveToFile() | |||
528 | } | 529 | } |
529 | if ( createbup ) { | 530 | if ( createbup ) { |
530 | CalendarLocal cal; | 531 | CalendarLocal cal; |
531 | cal.setTimeZoneId(KOPrefs::instance()->mTimeZoneId); | 532 | cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
532 | Incidence *incidence = delSel.first(); | 533 | Incidence *incidence = delSel.first(); |
533 | while ( incidence ) { | 534 | while ( incidence ) { |
534 | cal.addIncidence( incidence->clone() ); | 535 | cal.addIncidence( incidence->clone() ); |
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 258f738..ba1c6d1 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp | |||
@@ -143,18 +143,10 @@ KOPrefs::KOPrefs() : | |||
143 | 143 | ||
144 | KPrefs::setCurrentGroup("Time & Date"); | 144 | KPrefs::setCurrentGroup("Time & Date"); |
145 | 145 | ||
146 | // addItemString("Time Zone",&mTimeZone,"+0100"); | ||
147 | addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); | ||
148 | // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60); | ||
149 | addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); | ||
150 | addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); | ||
151 | addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); | ||
152 | |||
153 | 146 | ||
154 | addItemInt("Default Start Time",&mStartTime,10); | 147 | addItemInt("Default Start Time",&mStartTime,10); |
155 | addItemInt("Default Duration",&mDefaultDuration,2); | 148 | addItemInt("Default Duration",&mDefaultDuration,2); |
156 | addItemInt("Default Alarm Time",&mAlarmTime,3); | 149 | addItemInt("Default Alarm Time",&mAlarmTime,3); |
157 | addItemInt("Daylight Savings",&mDaylightSavings,0); | ||
158 | KPrefs::setCurrentGroup("AlarmSettings"); | 150 | KPrefs::setCurrentGroup("AlarmSettings"); |
159 | addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); | 151 | addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20); |
160 | addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); | 152 | addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7); |
@@ -354,7 +346,7 @@ void KOPrefs::fillMailDefaults() | |||
354 | 346 | ||
355 | void KOPrefs::setTimeZoneIdDefault() | 347 | void KOPrefs::setTimeZoneIdDefault() |
356 | { | 348 | { |
357 | mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)"); | 349 | ; |
358 | } | 350 | } |
359 | 351 | ||
360 | void KOPrefs::setCategoryDefaults() | 352 | void KOPrefs::setCategoryDefaults() |
@@ -488,9 +480,6 @@ void KOPrefs::usrReadConfig() | |||
488 | 480 | ||
489 | } | 481 | } |
490 | 482 | ||
491 | if (mTimeZoneId.isEmpty()) { | ||
492 | setTimeZoneIdDefault(); | ||
493 | } | ||
494 | KPimPrefs::usrReadConfig(); | 483 | KPimPrefs::usrReadConfig(); |
495 | } | 484 | } |
496 | 485 | ||
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 03df59b..c74b0ef 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -95,13 +95,9 @@ class KOPrefs : public KPimPrefs | |||
95 | int mDefaultFormat; | 95 | int mDefaultFormat; |
96 | int mMailClient; | 96 | int mMailClient; |
97 | 97 | ||
98 | QString mTimeZone; | ||
99 | //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius | ||
100 | //int mTimeZoneOffset; // e.g. -240 min | ||
101 | int mStartTime; | 98 | int mStartTime; |
102 | int mDefaultDuration; | 99 | int mDefaultDuration; |
103 | int mAlarmTime; | 100 | int mAlarmTime; |
104 | int mDaylightSavings; | ||
105 | 101 | ||
106 | int mWorkingHoursStart; | 102 | int mWorkingHoursStart; |
107 | int mWorkingHoursEnd; | 103 | int mWorkingHoursEnd; |
@@ -271,11 +267,6 @@ class KOPrefs : public KPimPrefs | |||
271 | int mPreferredLanguage; | 267 | int mPreferredLanguage; |
272 | int mPreferredTime; | 268 | int mPreferredTime; |
273 | bool mWeekStartsOnSunday; | 269 | bool mWeekStartsOnSunday; |
274 | QString mTimeZoneId; | ||
275 | bool mUseDaylightsaving; | ||
276 | int mDaylightsavingStart; | ||
277 | int mDaylightsavingEnd; | ||
278 | |||
279 | 270 | ||
280 | private: | 271 | private: |
281 | QDict<QColor> mCategoryColors; | 272 | QDict<QColor> mCategoryColors; |