author | zautrix <zautrix> | 2004-09-22 03:08:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-22 03:08:05 (UTC) |
commit | d63eac7a612a9724705bc58ad98c65c6ac052d07 (patch) (side-by-side diff) | |
tree | dc584a0ddcbd5f828ea36b86b6af640e46e137f2 | |
parent | 633522024e48efc423155a04b71083a03696211d (diff) | |
download | kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.zip kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.tar.gz kdepimpi-d63eac7a612a9724705bc58ad98c65c6ac052d07.tar.bz2 |
connected global config
-rw-r--r-- | kaddressbook/mainembedded.cpp | 15 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 18 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 2 | ||||
-rw-r--r-- | korganizer/calendarview.cpp | 6 | ||||
-rw-r--r-- | korganizer/koprefs.cpp | 2 | ||||
-rw-r--r-- | korganizer/koprefsdialog.cpp | 106 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | libkdepim/kcmconfigs/kdepimconfigwidget.cpp | 2 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.cpp | 17 | ||||
-rw-r--r-- | libkdepim/kpimglobalprefs.h | 4 |
10 files changed, 93 insertions, 81 deletions
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp index 10b1013..965fb06 100644 --- a/kaddressbook/mainembedded.cpp +++ b/kaddressbook/mainembedded.cpp @@ -17,2 +17,3 @@ #include "externalapphandler.h" +#include <libkdepim/kpimglobalprefs.h> @@ -75,15 +76,3 @@ int main( int argc, char **argv ) { - KConfig kon ( locateLocal( "config", "korganizerrc" ) ); - kon.setGroup("Locale"); - KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) ); - QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( ""); - KGlobal::locale()->setHore24Format( !kon.readNumEntry( "PreferredTime",0 ) ); - KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); - dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" ); - KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); - kon.setGroup("Time & Date"); - KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ), - kon.readNumEntry( "DaylightsavingStart", 90), - kon.readNumEntry( "DaylightsavingEnd",304) ); - KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); + KPimGlobalPrefs::instance()->setGlobalConfig(); } diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index 09a6447..e691082 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp @@ -31,21 +31,3 @@ const QDateTime Genericwrapper::parseDateTime( mailimf_date_time *date ) { - static bool init = false ; - if ( ! init ) { - KConfig kon ( locateLocal( "config", "korganizerrc" ) ); - kon.setGroup("Locale"); - KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) ); - QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );// kon.readEntry( ""); - KGlobal::locale()->setHore24Format( !kon.readNumEntry( "PreferredTime",0 ) ); - KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); - dummy = kon.readEntry( "UserDateFormatLong","%A %d %b %y" ); - KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); - kon.setGroup("Time & Date"); - KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ), - kon.readNumEntry( "DaylightsavingStart", 90), - kon.readNumEntry( "DaylightsavingEnd",304) ); - KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") ); - - init = true; - } QDate da (date->dt_year,date->dt_month, date->dt_day ); diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 9a1a750..164988c 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -17,2 +17,3 @@ #include <libkdepim/externalapphandler.h> +#include <libkdepim/kpimglobalprefs.h> @@ -34,2 +35,3 @@ OpieMail::OpieMail( QWidget *parent, const char *name ) settings = new Settings(); + KPimGlobalPrefs::instance()->setGlobalConfig(); diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index bc8625d..3635cfa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -65,2 +65,3 @@ #include <libkdepim/ksyncprofile.h> +#include <libkdepim/kpimglobalprefs.h> @@ -1886,4 +1887,6 @@ void CalendarView::goPreviousMonth() } -void CalendarView::writeLocale() +void CalendarView::writeLocale() { + //KPimGlobalPrefs::instance()->setGlobalConfig(); +#if 0 KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime ); @@ -1900,2 +1903,3 @@ void CalendarView::writeLocale() KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId ); +#endif } diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index dd978bf..5d7db4f 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -43,2 +43,3 @@ #include <kstaticdeleter.h> +#include <libkdepim/kpimglobalprefs.h> @@ -392,2 +393,3 @@ void KOPrefs::usrReadConfig() { + mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage; mLocaleDict = 0; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 7dafcd8..b4b3b27 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -83,6 +83,6 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) : setupMainTab(); - setupLocaleTab(); - setupTimeZoneTab(); + // setupLocaleTab(); + //setupTimeZoneTab(); setupTimeTab(); - setupLocaleDateTab(); + //setupLocaleDateTab(); setupFontsTab(); @@ -112,2 +112,3 @@ void KOPrefsDialog::setupLocaleDateTab() { +#if 0 QFrame *topFrame = addPage(i18n("Date Format"),0,0); @@ -161,2 +162,3 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0); ++iii; +#endif @@ -166,2 +168,3 @@ void KOPrefsDialog::setupLocaleTab() { +#if 0 QFrame *topFrame = addPage(i18n("Locale"),0,0); @@ -225,2 +228,3 @@ void KOPrefsDialog::setupLocaleTab() #endif +#endif } @@ -625,18 +629,3 @@ void KOPrefsDialog::setupViewsTab() } - KPrefsDialogWidBool *passwdk = - addWidBool(i18n("Show parent To-Do's in What's Next view"), - &(KOPrefs::instance()->mWNViewShowsParents),topFrame); - topLayout->addWidget(passwdk->checkBox(), ii++,0); - - passwdk = - addWidBool(i18n("Show location in What's Next view"), - &(KOPrefs::instance()->mWNViewShowLocation),topFrame); - topLayout->addWidget(passwdk->checkBox(), ii++,0); - - passwdk = - addWidBool(i18n("Show Sync Events in WN/Agenda view"), - &(KOPrefs::instance()->mShowSyncEvents),topFrame); - topLayout->addWidget(passwdk->checkBox(), ii++,0); - - + KPrefsDialogWidBool *marcusBainsEnabled = @@ -801,3 +790,29 @@ void KOPrefsDialog::setupViewsTab() topLayout->addWidget(holidayColor->button(),ii++,1); - + // *********************** What'sNext View + topFrame = addPage(i18n("What's Next View"),0,0); + // DesktopIcon("viewmag",KIcon::SizeMedium)); + + topLayout = new QGridLayout(topFrame,4,1); + topLayout->setSpacing(spacingHint()); + topLayout->setMargin(marginHint()); + ii = 0; + KPrefsDialogWidBool *passwdk = + addWidBool(i18n("Show parent To-Do's in What's Next view"), + &(KOPrefs::instance()->mWNViewShowsParents),topFrame); + topLayout->addWidget(passwdk->checkBox(), ii++,0); + + passwdk = + addWidBool(i18n("Show location in What's Next view"), + &(KOPrefs::instance()->mWNViewShowLocation),topFrame); + topLayout->addWidget(passwdk->checkBox(), ii++,0); + + passwdk = + addWidBool(i18n("Show Sync Events in \nWhat's Next/Agenda view"), + &(KOPrefs::instance()->mShowSyncEvents),topFrame); + topLayout->addWidget(passwdk->checkBox(), ii++,0); + passwdk = + addWidBool(i18n("Use short date in \nWhat's Next/Event view"), + &(KOPrefs::instance()->mShortDateInViewer),topFrame); + topLayout->addMultiCellWidget(passwdk->checkBox(), ii,ii,0,1); + // *********************** Todo View @@ -1338,6 +1353,6 @@ void KOPrefsDialog::usrReadConfig() mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval); - QDate current ( 2001, 1,1); - mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); - mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); - setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); + // QDate current ( 2001, 1,1); + //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1)); + //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); + //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId)); //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset); @@ -1368,6 +1383,6 @@ void KOPrefsDialog::usrReadConfig() mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile); - QString dummy = KOPrefs::instance()->mUserDateFormatLong; - mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); - dummy = KOPrefs::instance()->mUserDateFormatShort; - mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); + //QString dummy = KOPrefs::instance()->mUserDateFormatLong; + //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") )); + //dummy = KOPrefs::instance()->mUserDateFormatShort; + //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") )); updateCategories(); @@ -1391,4 +1406,4 @@ void KOPrefsDialog::usrWriteConfig() - KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); - KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); + //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") ); + //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") ); KOPrefs::instance()->setFullName(mNameEdit->text()); @@ -1398,16 +1413,16 @@ void KOPrefsDialog::usrWriteConfig() - KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); - QDate date; - date = mStartDateSavingEdit->date(); - int sub = 0; - if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) - sub = 1; - KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; - date = mEndDateSavingEdit->date(); - if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) - sub = 1; - else - sub = 0; - KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; - // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); + // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); + //QDate date; + //date = mStartDateSavingEdit->date(); + //int sub = 0; + //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) + // sub = 1; +// KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub; +// date = mEndDateSavingEdit->date(); +// if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 ) +// sub = 1; +// else +// sub = 0; +// KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub; +// // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value(); @@ -1559,2 +1574,3 @@ void KOPrefsDialog::setupTimeZoneTab() { +#if 0 QFrame *topFrame = addPage(i18n("Time Zone"),0,0); @@ -1617,3 +1633,3 @@ void KOPrefsDialog::setupTimeZoneTab() mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1)); - +#endif diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index b597a6a..1c4a186 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp @@ -36,2 +36,3 @@ #include <libkcal/kincidenceformatter.h> +#include <libkdepim/kpimglobalprefs.h> @@ -83,2 +84,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) : KOPrefs *p = KOPrefs::instance(); + KPimGlobalPrefs::instance()->setGlobalConfig(); // if ( QApplication::desktop()->height() > 480 ) { diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp index 00a07d9..2819ab1 100644 --- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp +++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp @@ -746,3 +746,3 @@ void KDEPIMConfigWidget::usrWriteConfig() ExternalAppHandler::instance()->loadConfig(); - + KPimGlobalPrefs::instance()->setGlobalConfig(); } diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp index 12a503d..a896a0f 100644 --- a/libkdepim/kpimglobalprefs.cpp +++ b/libkdepim/kpimglobalprefs.cpp @@ -102,2 +102,19 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) +void KPimGlobalPrefs::setGlobalConfig() +{ + + KGlobal::locale()->setHore24Format( !mPreferredTime ); + KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday ); + KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate ); + KGlobal::locale()->setLanguage( mPreferredLanguage ); + QString dummy = mUserDateFormatLong; + KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") )); + dummy = mUserDateFormatShort; + KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") )); + KGlobal::locale()->setDaylightSaving( mUseDaylightsaving, + mDaylightsavingStart, + mDaylightsavingEnd ); + KGlobal::locale()->setTimezone( mTimeZoneId ); + +} KPimGlobalPrefs::~KPimGlobalPrefs() diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h index dad78e6..84ba689 100644 --- a/libkdepim/kpimglobalprefs.h +++ b/libkdepim/kpimglobalprefs.h @@ -39,2 +39,3 @@ class KPimGlobalPrefs : public KPrefs + void setGlobalConfig(); static KPimGlobalPrefs *instance(); @@ -98,5 +99,2 @@ class KPimGlobalPrefs : public KPrefs - - - int mEmailClient; |