summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-22 22:10:16 (UTC)
committer zautrix <zautrix>2004-10-22 22:10:16 (UTC)
commitb8da6435b8e5941eb1824873e68d8a6a728fae5e (patch) (side-by-side diff)
treebc5ed11961e89bcd606f6fbca32185dbf8afab7a
parenta5274f27dc71e1a0ffae73f32f84f4dd013b4b76 (diff)
downloadkdepimpi-b8da6435b8e5941eb1824873e68d8a6a728fae5e.zip
kdepimpi-b8da6435b8e5941eb1824873e68d8a6a728fae5e.tar.gz
kdepimpi-b8da6435b8e5941eb1824873e68d8a6a728fae5e.tar.bz2
fixed an ugly timezone bug
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/views/contactlistview.cpp4
-rw-r--r--kmicromail/koprefs.cpp12
-rw-r--r--kmicromail/koprefs.h2
-rw-r--r--korganizer/calendarview.cpp12
-rw-r--r--korganizer/kolistview.cpp5
-rw-r--r--korganizer/koprefs.cpp13
-rw-r--r--korganizer/koprefs.h9
-rw-r--r--libkdepim/kpimglobalprefs.cpp2
-rw-r--r--microkde/kdecore/klocale.cpp50
9 files changed, 41 insertions, 68 deletions
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 5fb4163..ad43970 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -169,13 +169,13 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
QString ContactListViewItem::key(int column, bool ascending) const
{
#ifndef DESKTOP_VERSION
int lan = KGlobal::locale()->language();
//qDebug("language %d ", lan);
if ( lan == 1 ) { //GERMAN
- QString ret = QListViewItem::key(column, ascending).utf8();
+ QString ret = QListViewItem::key(column, ascending).lower().utf8();
int start = -1;
while ( (start = ret.find( 'ä', start+1)) > 0 ) {
ret.at(start-1) = 'a';
}
start = -1;
while ( (start = ret.find( 'ö', start+1)) > 0 ) {
@@ -186,13 +186,13 @@ QString ContactListViewItem::key(int column, bool ascending) const
ret.at(start-1) = 'o';
}
start = -1;
while ( (start = ret.find( 'ß', start+1)) > 0 ) {
ret.at(start-1) = 's';
}
- //qDebug("conv string %s ", ret.latin1());
+ qDebug("conv string %s ", ret.latin1());
return ret;
}
else
#endif
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index c0200ff..8143b6f 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -64,13 +64,13 @@ KOPrefs::KOPrefs() :
addItemBool("UseKapi",&mUseKapi,false);
KPrefs::setCurrentGroup("Fonts");
addItemFont("Application Font",&mAppFont);
addItemFont("Compose Font",&mComposeFont);
addItemFont("Read Font",&mReadFont);
-
+ fillMailDefaults();
}
KOPrefs::~KOPrefs()
{
@@ -94,22 +94,16 @@ void KOPrefs::usrSetDefaults()
{
}
void KOPrefs::fillMailDefaults()
{
- if (mName.isEmpty()) mName = i18n("Anonymous");
- if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
+ if (mName.isEmpty()) mName = i18n ("Please set at");
+ if (mEmail.isEmpty()) mEmail = i18n ("Settings@General TAB");
}
-void KOPrefs::setTimeZoneIdDefault()
-{
- mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)");
-}
-
-
void KOPrefs::usrReadConfig()
{
KPimPrefs::usrReadConfig();
}
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index c42d787..a47642b 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -49,13 +49,12 @@ class KOPrefs : public KPimPrefs
/** Write preferences to config file */
void usrWriteConfig();
void setCategoryDefaults(){;};
protected:
- void setTimeZoneIdDefault();
/** Fill empty mail fields with default values. */
void fillMailDefaults();
private:
/** Constructor disabled for public. Use instance() to create a KOPrefs
@@ -67,13 +66,12 @@ class KOPrefs : public KPimPrefs
public:
// preferences data
KConfig* getConfig();
QFont mAppFont;
QFont mComposeFont;
QFont mReadFont;
- QFont mTimeZoneId;
QString mName;
QString mEmail;
bool mSendLater, mViewAsHtml, mUseKapi;
private:
};
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0306e07..e64d83a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1196,13 +1196,13 @@ void CalendarView::setSyncName( QString s )
}
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 ... ");
if ( storage->load() ) {
getEventViewerDialog()->setSyncMode( true );
@@ -1227,13 +1227,13 @@ bool CalendarView::syncCalendar(QString filename, int mode)
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);
#ifndef DESKTOP_VERSION
SharpFormat* sharpFormat = 0;
@@ -1495,13 +1495,13 @@ bool CalendarView::importQtopia( const QString &categories,
mGlobalSyncMode = SYNC_MODE_QTOPIA;
mCurrentSyncDevice = "qtopia-XML";
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;
if ( !categories.isEmpty() )
loadOk = qtopiaFormat.load( calendar, categories );
@@ -1998,24 +1998,24 @@ void CalendarView::writeLocale()
KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
dummy = KOPrefs::instance()->mUserDateFormatShort;
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()
{
writeLocale();
if ( KOPrefs::instance()->mUseAppColors )
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();
}
void CalendarView::eventChanged(Event *event)
@@ -2317,13 +2317,13 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
if ( createbup ) {
QString description = "\n";
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;
else {
description.sprintf(i18n(" %d items?"),delSel.count() );
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index bafd349..d3aa650 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -36,12 +36,13 @@
#include <klocale.h>
#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>
#include <libkcal/recurrence.h>
#include <libkcal/filestorage.h>
@@ -374,13 +375,13 @@ void KOListView::beamSelected()
fn = QDir::homeDirPath()+"/kopitempbeamfile.vcs";
QString mes;
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";
cal->addIncidence( in );
incidence = delSel.next();
@@ -525,13 +526,13 @@ void KOListView::saveToFile()
if ( result != 0 ) {
createbup = false;
}
}
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();
}
ICalFormat format;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 258f738..ba1c6d1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -140,24 +140,16 @@ KOPrefs::KOPrefs() :
addItemInt("Mail Client",&mMailClient,MailClientKMail);
addItemBool("Use Control Center Email",&mEmailControlCenter,false);
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);
addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
@@ -351,13 +343,13 @@ void KOPrefs::fillMailDefaults()
if (mName.isEmpty()) mName = i18n("Anonymous");
if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
}
void KOPrefs::setTimeZoneIdDefault()
{
- mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)");
+ ;
}
void KOPrefs::setCategoryDefaults()
{
mCustomCategories.clear();
mCustomCategories = getDefaultList();
@@ -485,15 +477,12 @@ void KOPrefs::usrReadConfig()
QStringList::Iterator it;
for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
}
- if (mTimeZoneId.isEmpty()) {
- setTimeZoneIdDefault();
- }
KPimPrefs::usrReadConfig();
}
void KOPrefs::usrWriteConfig()
{
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 03df59b..c74b0ef 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -92,19 +92,15 @@ class KOPrefs : public KPimPrefs
bool mEnableGroupScheduling;
bool mEnableProjectView;
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;
bool mExcludeSaturdays;
bool mMarcusBainsShowSeconds;
@@ -268,17 +264,12 @@ class KOPrefs : public KPimPrefs
int mPreferredDate;
QString mUserDateFormatLong;
QString mUserDateFormatShort;
int mPreferredLanguage;
int mPreferredTime;
bool mWeekStartsOnSunday;
- QString mTimeZoneId;
- bool mUseDaylightsaving;
- int mDaylightsavingStart;
- int mDaylightsavingEnd;
-
private:
QDict<QColor> mCategoryColors;
QColor mDefaultCategoryColor;
QFont mDefaultTimeBarFont;
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 7cd6038..0a580ca 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -54,13 +54,13 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
// 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)") );
+ addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") );
addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false);
addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
KPrefs::setCurrentGroup( "ExternalApplications" );
diff --git a/microkde/kdecore/klocale.cpp b/microkde/kdecore/klocale.cpp
index 21e6937..d3b04dc 100644
--- a/microkde/kdecore/klocale.cpp
+++ b/microkde/kdecore/klocale.cpp
@@ -128,37 +128,37 @@ KLocale::KLocale() : mCalendarSystem( 0 )
mHourF24Format = true;
mIntDateFormat = Default;
mIntTimeFormat = Default;
mLanguage = 0;
mDateFormat = "%a %Y %b %d";
mDateFormatShort = "%Y-%m-%d";
- mTimeZoneList << i18n ("-11:00 US/Samoa")
- << i18n ("-10:00 US/Hawaii")
- << i18n ("-09:00 US/Alaska")
- << i18n ("-08:00 US/Pacific")
- << i18n ("-07:00 US/Mountain")
- << i18n ("-06:00 US/Central")
- << i18n ("-05:00 US/Eastern")
- << i18n ("-04:00 Brazil/West")
- << i18n ("-03:00 Brazil/East")
- << i18n ("-02:00 Brazil/DeNoronha")
- << i18n ("-01:00 Atlantic/Azores")
- << i18n (" 00:00 Europe/London(UTC)")
- << i18n ("+01:00 Europe/Oslo(CET)")
- << i18n ("+02:00 Europe/Helsinki")
- << i18n ("+03:00 Europe/Moscow")
- << i18n ("+04:00 Indian/Mauritius")
- << i18n ("+05:00 Indian/Maldives")
- << i18n ("+06:00 Indian/Chagos")
- << i18n ("+07:00 Asia/Bangkok")
- << i18n ("+08:00 Asia/Hongkong")
- << i18n ("+09:00 Asia/Tokyo")
- << i18n ("+10:00 Asia/Vladivostok")
- << i18n ("+11:00 Asia/Magadan")
- << i18n ("+12:00 Asia/Kamchatka")
- // << i18n (" xx:xx User defined offset")
+ mTimeZoneList << ("-11:00 US/Samoa")
+ << ("-10:00 US/Hawaii")
+ << ("-09:00 US/Alaska")
+ << ("-08:00 US/Pacific")
+ << ("-07:00 US/Mountain")
+ << ("-06:00 US/Central")
+ << ("-05:00 US/Eastern")
+ << ("-04:00 Brazil/West")
+ << ("-03:00 Brazil/East")
+ << ("-02:00 Brazil/DeNoronha")
+ << ("-01:00 Atlantic/Azores")
+ << (" 00:00 Europe/London(UTC)")
+ << ("+01:00 Europe/Oslo(CET)")
+ << ("+02:00 Europe/Helsinki")
+ << ("+03:00 Europe/Moscow")
+ << ("+04:00 Indian/Mauritius")
+ << ("+05:00 Indian/Maldives")
+ << ("+06:00 Indian/Chagos")
+ << ("+07:00 Asia/Bangkok")
+ << ("+08:00 Asia/Hongkong")
+ << ("+09:00 Asia/Tokyo")
+ << ("+10:00 Asia/Vladivostok")
+ << ("+11:00 Asia/Magadan")
+ << ("+12:00 Asia/Kamchatka")
+ // << (" xx:xx User defined offset")
<< i18n (" Local Time");
mSouthDaylight = false;
mTimeZoneOffset = 0;
daylightEnabled = false;
}