summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -173,5 +173,5 @@ QString ContactListViewItem::key(int column, bool ascending) const
//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 ) {
@@ -190,5 +190,5 @@ QString ContactListViewItem::key(int column, bool ascending) const
ret.at(start-1) = 's';
}
- //qDebug("conv string %s ", ret.latin1());
+ qDebug("conv string %s ", ret.latin1());
return ret;
diff --git a/kmicromail/koprefs.cpp b/kmicromail/koprefs.cpp
index c0200ff..8143b6f 100644
--- a/kmicromail/koprefs.cpp
+++ b/kmicromail/koprefs.cpp
@@ -68,5 +68,5 @@ KOPrefs::KOPrefs() :
addItemFont("Compose Font",&mComposeFont);
addItemFont("Read Font",&mReadFont);
-
+ fillMailDefaults();
}
@@ -98,14 +98,8 @@ 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()
{
diff --git a/kmicromail/koprefs.h b/kmicromail/koprefs.h
index c42d787..a47642b 100644
--- a/kmicromail/koprefs.h
+++ b/kmicromail/koprefs.h
@@ -53,5 +53,4 @@ class KOPrefs : public KPimPrefs
protected:
- void setTimeZoneIdDefault();
/** Fill empty mail fields with default values. */
@@ -71,5 +70,4 @@ class KOPrefs : public KPimPrefs
QFont mComposeFont;
QFont mReadFont;
- QFont mTimeZoneId;
QString mName;
QString mEmail;
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0306e07..e64d83a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1200,5 +1200,5 @@ bool CalendarView::syncCalendar(QString filename, int mode)
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;
@@ -1231,5 +1231,5 @@ void CalendarView::syncExternal( int mode )
qApp->processEvents();
CalendarLocal* calendar = new CalendarLocal();
- calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
bool syncOK = false;
bool loadSuccess = false;
@@ -1499,5 +1499,5 @@ bool CalendarView::importQtopia( const QString &categories,
qApp->processEvents();
CalendarLocal* calendar = new CalendarLocal();
- calendar->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
bool syncOK = false;
QtopiaFormat qtopiaFormat;
@@ -2002,5 +2002,5 @@ void CalendarView::writeLocale()
KOPrefs::instance()->mDaylightsavingStart,
KOPrefs::instance()->mDaylightsavingEnd );
- KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId );
+ KGlobal::locale()->setTimezone( KPimGlobalPrefs::instance()->mTimeZoneId );
#endif
}
@@ -2013,5 +2013,5 @@ void CalendarView::updateConfig()
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();
@@ -2321,5 +2321,5 @@ void CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
cal->setLocalTime();
else
- cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
Incidence *incidence = delSel.first();
bool addText = false;
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index bafd349..d3aa650 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -40,4 +40,5 @@
#include <kglobal.h>
+#include <libkdepim/kpimglobalprefs.h>
#include <libkcal/calendar.h>
#include <libkcal/calendarlocal.h>
@@ -378,5 +379,5 @@ void KOListView::beamSelected()
QString description = "\n";
CalendarLocal* cal = new CalendarLocal();
- cal->setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
Incidence *incidence = delSel.first();
while ( incidence ) {
@@ -529,5 +530,5 @@ void KOListView::saveToFile()
if ( createbup ) {
CalendarLocal cal;
- cal.setTimeZoneId(KOPrefs::instance()->mTimeZoneId);
+ cal.setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
Incidence *incidence = delSel.first();
while ( incidence ) {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 258f738..ba1c6d1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -144,16 +144,8 @@ KOPrefs::KOPrefs() :
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);
@@ -355,5 +347,5 @@ void KOPrefs::fillMailDefaults()
void KOPrefs::setTimeZoneIdDefault()
{
- mTimeZoneId = i18n("+01:00 Europe/Oslo(CET)");
+ ;
}
@@ -489,7 +481,4 @@ 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
@@ -96,11 +96,7 @@ class KOPrefs : public KPimPrefs
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;
@@ -272,9 +268,4 @@ class KOPrefs : public KPimPrefs
int mPreferredTime;
bool mWeekStartsOnSunday;
- QString mTimeZoneId;
- bool mUseDaylightsaving;
- int mDaylightsavingStart;
- int mDaylightsavingEnd;
-
private:
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 7cd6038..0a580ca 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -58,5 +58,5 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
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);
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
@@ -132,29 +132,29 @@ KLocale::KLocale() : mCalendarSystem( 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;