| -rw-r--r-- | korganizer/calendarview.cpp | 12 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 5 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 15 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 9 |
4 files changed, 11 insertions, 30 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 0306e07..e64d83a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1201,3 +1201,3 @@ bool CalendarView::syncCalendar(QString filename, int mode) CalendarLocal* calendar = new CalendarLocal(); - calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); FileStorage* storage = new FileStorage( calendar ); @@ -1232,3 +1232,3 @@ void CalendarView::syncExternal( int mode ) CalendarLocal* calendar = new CalendarLocal(); - calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); bool syncOK = false; @@ -1500,3 +1500,3 @@ bool CalendarView::importQtopia( const QString &categories, CalendarLocal* calendar = new CalendarLocal(); - calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); bool syncOK = false; @@ -2003,3 +2003,3 @@ void CalendarView::writeLocale() KOPrefs::instance()->mDaylightsavingEnd ); - KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); + KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId ); #endif @@ -2014,3 +2014,3 @@ void CalendarView::updateConfig() // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont); - mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); // To make the "fill window" configurations work @@ -2322,3 +2322,3 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel ) else - cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); Incidence *incidence = delSel.first(); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index bafd349..d3aa650 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -41,2 +41,3 @@ +#include <libkdepim/kpimglobalprefs.h> #include <libkcal/calendar.h> @@ -379,3 +380,3 @@ void KOListView::beamSelected() CalendarLocal* cal = new CalendarLocal(); - cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); Incidence *incidence = delSel.first(); @@ -530,3 +531,3 @@ void KOListView::saveToFile() CalendarLocal cal; - cal.setTimeZoneId(KOPrefs::instance()->mTimeZoneId); + cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); Incidence *incidence = delSel.first(); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 258f738..ba1c6d1 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -145,9 +145,2 @@ KOPrefs::KOPrefs() : - // addItemString("Time Zone",&mTimeZone,"+0100"); - addItemString("TimeZoneName",&mTimeZoneId,i18n ("+01:00 Europe/Oslo(CET)") ); - // addItemInt("TimeZoneOffset",&mTimeZoneOffset,60); - addItemBool("UseDaylightsaving",&mUseDaylightsaving,true); - addItemInt("DaylightsavingStart",&mDaylightsavingStart,90); - addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304); - @@ -156,3 +149,2 @@ KOPrefs::KOPrefs() : addItemInt("Default Alarm Time",&mAlarmTime,3); - addItemInt("Daylight Savings",&mDaylightSavings,0); KPrefs::setCurrentGroup("AlarmSettings"); @@ -356,3 +348,3 @@ void KOPrefs::setTimeZoneIdDefault() { - mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)"); + ; } @@ -489,6 +481,3 @@ void KOPrefs::usrReadConfig() } - - if (mTimeZoneId.isEmpty()) { - setTimeZoneIdDefault(); - } + KPimPrefs::usrReadConfig(); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 03df59b..c74b0ef 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -97,5 +97,2 @@ class KOPrefs : public KPimPrefs - QString mTimeZone; - //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius - //int mTimeZoneOffset; // e.g. -240 min int mStartTime; @@ -103,3 +100,2 @@ class KOPrefs : public KPimPrefs int mAlarmTime; - int mDaylightSavings; @@ -273,7 +269,2 @@ class KOPrefs : public KPimPrefs bool mWeekStartsOnSunday; - QString mTimeZoneId; - bool mUseDaylightsaving; - int mDaylightsavingStart; - int mDaylightsavingEnd; - |