summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp12
-rw-r--r--korganizer/kolistview.cpp5
-rw-r--r--korganizer/koprefs.cpp15
-rw-r--r--korganizer/koprefs.h9
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
@@ -1198,9 +1198,9 @@ bool CalendarView::syncCalendar(QString filename, int mode)
{
//qDebug("syncCalendar %s ", filename.latin1());
mGlobalSyncMode = SYNC_MODE_NORMAL;
CalendarLocal* calendar = new CalendarLocal();
- calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
FileStorage* storage = new FileStorage( calendar );
bool syncOK = false;
storage->setFileName( filename );
// qDebug("loading ... ");
@@ -1229,9 +1229,9 @@ void CalendarView::syncExternal( int mode )
mGlobalSyncMode = SYNC_MODE_EXTERNAL;
qApp->processEvents();
CalendarLocal* calendar = new CalendarLocal();
- calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
bool syncOK = false;
bool loadSuccess = false;
PhoneFormat* phoneFormat = 0;
emit tempDisableBR(true);
@@ -1497,9 +1497,9 @@ bool CalendarView::importQtopia( const QString &categories,
if ( mSyncManager->mAskForPreferences )
edit_sync_options();
qApp->processEvents();
CalendarLocal* calendar = new CalendarLocal();
- calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
bool syncOK = false;
QtopiaFormat qtopiaFormat;
qtopiaFormat.setCategoriesList ( &(KOPrefs::instance()->mCustomCategories));
bool loadOk = true;
@@ -2000,9 +2000,9 @@ void CalendarView::writeLocale()
KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
KGlobal::locale()->setDaylightSaving( KOPrefs::instance()->mUseDaylightsaving,
KOPrefs::instance()->mDaylightsavingStart,
KOPrefs::instance()->mDaylightsavingEnd );
- KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId );
+ KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId );
#endif
}
void CalendarView::updateConfig()
{
@@ -2011,9 +2011,9 @@ void CalendarView::updateConfig()
QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
emit configChanged();
mTodoList->updateConfig();
// mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
- mCalendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
// To make the "fill window" configurations work
//mViewManager->raiseCurrentView();
}
@@ -2319,9 +2319,9 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
CalendarLocal* cal = new CalendarLocal();
if ( beamDialog->beamLocal() )
cal->setLocalTime();
else
- cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
Incidence *incidence = delSel.first();
bool addText = false;
if ( delSel.count() < 10 )
addText = true;
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index bafd349..d3aa650 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -38,8 +38,9 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kglobal.h>
+#include <libkdepim/kpimglobalprefs.h>
#include <libkcal/calendar.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/icalformat.h>
#include <libkcal/vcalformat.h>
@@ -376,9 +377,9 @@ void KOListView::beamSelected()
bool createbup = true;
if ( createbup ) {
QString description = "\n";
CalendarLocal* cal = new CalendarLocal();
- cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
Incidence *incidence = delSel.first();
while ( incidence ) {
Incidence *in = incidence->clone();
description += in->summary() + "\n";
@@ -527,9 +528,9 @@ void KOListView::saveToFile()
}
}
if ( createbup ) {
CalendarLocal cal;
- cal.setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
Incidence *incidence = delSel.first();
while ( incidence ) {
cal.addIncidence( incidence->clone() );
incidence = delSel.next();
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 258f738..ba1c6d1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -142,20 +142,12 @@ KOPrefs::KOPrefs() :
addItemBool("Bcc",&mBcc,false);
KPrefs::setCurrentGroup("Time & Date");
- // 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);
-
addItemInt("Default Start Time",&mStartTime,10);
addItemInt("Default Duration",&mDefaultDuration,2);
addItemInt("Default Alarm Time",&mAlarmTime,3);
- addItemInt("Daylight Savings",&mDaylightSavings,0);
KPrefs::setCurrentGroup("AlarmSettings");
addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
@@ -353,9 +345,9 @@ void KOPrefs::fillMailDefaults()
}
void KOPrefs::setTimeZoneIdDefault()
{
- mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)");
+ ;
}
void KOPrefs::setCategoryDefaults()
{
@@ -486,12 +478,9 @@ void KOPrefs::usrReadConfig()
for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
}
-
- 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
@@ -94,15 +94,11 @@ class KOPrefs : public KPimPrefs
int mDefaultFormat;
int mMailClient;
- QString mTimeZone;
- //QString mTimeZoneName; // e.g. +00:04:00 Indian/Mauritius
- //int mTimeZoneOffset; // e.g. -240 min
int mStartTime;
int mDefaultDuration;
int mAlarmTime;
- int mDaylightSavings;
int mWorkingHoursStart;
int mWorkingHoursEnd;
bool mExcludeHolidays;
@@ -270,13 +266,8 @@ class KOPrefs : public KPimPrefs
QString mUserDateFormatShort;
int mPreferredLanguage;
int mPreferredTime;
bool mWeekStartsOnSunday;
- QString mTimeZoneId;
- bool mUseDaylightsaving;
- int mDaylightsavingStart;
- int mDaylightsavingEnd;
-
private:
QDict<QColor> mCategoryColors;
QColor mDefaultCategoryColor;