connected global config

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
@@ -15,6 +15,7 @@
 #include <qdir.h>
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
+#include <libkdepim/kpimglobalprefs.h>
 
 int main( int argc, char **argv )
 {
@@ -73,19 +74,7 @@ int main( int argc, char **argv )
       QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 
       {
-          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();
       }
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m );
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
@@ -29,25 +29,7 @@ Genericwrapper::~Genericwrapper()
 }
 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 );
     QTime ti ( date->dt_hour, date->dt_min, date->dt_sec );
     QDateTime dt ( da ,ti );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 9a1a750..164988c 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -15,6 +15,7 @@
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <libkdepim/externalapphandler.h>
+#include <libkdepim/kpimglobalprefs.h>
 
 #include <qpe/qpeapplication.h>
 #include <libmailwrapper/smtpwrapper.h>
@@ -32,6 +33,7 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
     settings = new Settings();
+    KPimGlobalPrefs::instance()->setGlobalConfig();
 
     folderView->populate( settings->getAccounts() );
   
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index bc8625d..3635cfa 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -63,6 +63,7 @@
 #include <kdirwatch.h>
 #include <libkdepim/kdatepicker.h>
 #include <libkdepim/ksyncprofile.h>
+#include <libkdepim/kpimglobalprefs.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
@@ -1884,8 +1885,10 @@ void CalendarView::goPreviousMonth()
 {
     mNavigator->selectPreviousMonth();
 }
-void CalendarView::writeLocale()
+void CalendarView::writeLocale() 
 {
+    //KPimGlobalPrefs::instance()->setGlobalConfig();
+#if 0
     KGlobal::locale()->setHore24Format( !KOPrefs::instance()->mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !KOPrefs::instance()->mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)KOPrefs::instance()->mPreferredDate );
@@ -1898,6 +1901,7 @@ void CalendarView::writeLocale()
                                           KOPrefs::instance()->mDaylightsavingStart,
                                           KOPrefs::instance()->mDaylightsavingEnd );
     KGlobal::locale()->setTimezone( KOPrefs::instance()->mTimeZoneId );
+#endif
 }
 void CalendarView::updateConfig()
 {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index dd978bf..5d7db4f 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -41,6 +41,7 @@
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
+#include <libkdepim/kpimglobalprefs.h>
 
 #include "koprefs.h"
 #include "mainwindow.h"
@@ -390,6 +391,7 @@ QStringList KOPrefs::getDefaultList()
 
 void KOPrefs::usrReadConfig()
 {
+    mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
     mLocaleDict = 0;
     // pending LR fix translation
     // qDebug("KOPrefs::usrReadConfig() fix translation ");
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 7dafcd8..b4b3b27 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -81,10 +81,10 @@ KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
 
   setupGlobalTab();
   setupMainTab();
-  setupLocaleTab();
-  setupTimeZoneTab();
+  // setupLocaleTab();
+  //setupTimeZoneTab();
   setupTimeTab();
-  setupLocaleDateTab();
+  //setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
@@ -110,6 +110,7 @@ void KOPrefsDialog::setupGlobalTab()
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
+#if 0
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(spacingHint());
@@ -159,11 +160,13 @@ QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
+#endif
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
+#if 0
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(spacingHint());
@@ -223,6 +226,7 @@ void  KOPrefsDialog::setupLocaleTab()
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
+#endif
 }
 void KOPrefsDialog::showSyncPage()
 {
@@ -623,22 +627,7 @@ void KOPrefsDialog::setupViewsTab()
       topLayout->addWidget(enableToolTips->checkBox(),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 WN/Agenda view"),
-               &(KOPrefs::instance()->mShowSyncEvents),topFrame);
-   topLayout->addWidget(passwdk->checkBox(), ii++,0);
-  
-   
+ 
   KPrefsDialogWidBool *marcusBainsEnabled =
       addWidBool(i18n("Show Marcus Bains line"),
                  &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
@@ -799,7 +788,33 @@ void KOPrefsDialog::setupViewsTab()
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   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
 
    topFrame = addPage(i18n("Todo View"),0,0);
@@ -1336,10 +1351,10 @@ void KOPrefsDialog::usrReadConfig()
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   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);
   mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
   mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
@@ -1366,10 +1381,10 @@ void KOPrefsDialog::usrReadConfig()
 
   //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
   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();
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
@@ -1389,27 +1404,27 @@ void KOPrefsDialog::usrWriteConfig()
     //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
 
-    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());
     KOPrefs::instance()->setEmail(mEmailEdit->text());
     
     KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->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();
+    // 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()->mStartTime = mStartTimeSpin->value();
     KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
@@ -1557,6 +1572,7 @@ void KOPrefsDialog::updateTimezoneOffset( int index )
 
 void KOPrefsDialog::setupTimeZoneTab()
 {
+#if 0
     QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
@@ -1615,7 +1631,7 @@ void KOPrefsDialog::setupTimeZoneTab()
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
   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
@@ -34,6 +34,7 @@
 #include <libkcal/todo.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkcal/kincidenceformatter.h>
+#include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
@@ -81,6 +82,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mFlagKeyPressed = false;
     setCaption("KOrganizer/Pi");
     KOPrefs *p = KOPrefs::instance();
+    KPimGlobalPrefs::instance()->setGlobalConfig();
    //  if ( QApplication::desktop()->height() > 480 ) {
 //         if ( p->mHourSize == 4 )
 //             p->mHourSize = 6;
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
@@ -744,7 +744,7 @@ void KDEPIMConfigWidget::usrWriteConfig()
 
   //release the cache that other views can access the changed values instantanious
   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
@@ -100,6 +100,23 @@ 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
@@ -37,6 +37,7 @@ class KPimGlobalPrefs : public KPrefs
 {
   public:
 
+    void setGlobalConfig();
     static KPimGlobalPrefs *instance();
 
 
@@ -96,9 +97,6 @@ class KPimGlobalPrefs : public KPrefs
     int mDaylightsavingStart;
     int mDaylightsavingEnd;
 
-
-
-
     int mEmailClient;
     QString mEmailOtherChannel;
     QString mEmailOtherMessage;