global settings bugfixes

5 files changed, 14 insertions, 103 deletions

diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 58198a2..db7c3f2 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -88,9 +88,9 @@ void KODialogManager::createOutgoingDialog()
 }
 
 void KODialogManager::showOptionsDialog( bool showSync )
 {
-    int curLanguage = KOPrefs::instance()->mPreferredLanguage;
+   
   if (!mOptionsDialog) {
     mOptionsDialog = new KOPrefsDialog(mMainView);
     //mOptionsDialog->readConfig();
     connect(mOptionsDialog,SIGNAL(configChanged()),
@@ -107,10 +107,9 @@ void KODialogManager::showOptionsDialog( bool showSync )
 #endif
   if ( showSync )
       mOptionsDialog->showSyncPage();
   mOptionsDialog->exec();
-  if ( curLanguage != KOPrefs::instance()->mPreferredLanguage )
-      KOPrefs::instance()->mLanguageChanged = true;
+  
 }
 void KODialogManager::showSyncOptions()
 {
     showOptionsDialog( true );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index ba1c6d1..f44debc 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -45,21 +45,15 @@
 
 #include "koprefs.h"
 #include "mainwindow.h"
 
-const char *germanwords[][2] = { 
-#include "wordsgerman.h"
-  "", ""
-};
-
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 
 KOPrefs::KOPrefs() :
   KPimPrefs("korganizerrc")
 {
   mCategoryColors.setAutoDelete(true);
-  mLocaleDict = 0;
   fillMailDefaults();
   mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
   QColor defaultHolidayColor      = QColor(255,0,0);
   QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
@@ -99,9 +93,9 @@ KOPrefs::KOPrefs() :
   addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
   addItemBool("ShowIconNext",&mShowIconNext,true);
   addItemBool("ShowIconJournal",&mShowIconJournal,true); 
   addItemBool("ShowIconStretch",&mShowIconStretch,true); 
-  addItemBool("LanguageChanged",&mLanguageChanged,false); 
+  addItemInt("LastLoadedLanguage",&mOldLanguage,0);
 
   addItemBool("AskForQuit",&mAskForQuit,false); 
 
 #ifndef DESKTOP_VERSION
@@ -203,15 +197,9 @@ KOPrefs::KOPrefs() :
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
-  addItemInt("PreferredLanguage",&mPreferredLanguage,0);
-  addItemInt("PreferredTime",&mPreferredTime,0);
-  addItemInt("PreferredDate",&mPreferredDate,0);
-  addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false); 
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
-  addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
-  addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
@@ -315,11 +303,9 @@ KOPrefs::KOPrefs() :
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
-  setLocaleDict( 0 );
-  if ( mLocaleDict )
-      delete mLocaleDict;
+ 
   //qDebug("KOPrefs::~KOPrefs() ");
 }
 
 
@@ -376,82 +362,18 @@ QStringList KOPrefs::getDefaultList()
 }
 
 void KOPrefs::usrReadConfig()
 {
-    mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
-    mLocaleDict = 0;
-    // pending LR fix translation
-    // qDebug("KOPrefs::usrReadConfig() fix translation ");
-    if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
-        if ( mPreferredLanguage == 1 ) {
-            mLocaleDict = new QDict<QString>;
-            int i = 0;
-            QString fw ( germanwords[i] [0]);
-            while ( !fw.isEmpty() ) {
-                mLocaleDict->insert( fw, new QString (germanwords[i] [1] ));
-                ++i;
-                fw = germanwords[i] [0];
-            }
-        
-            setLocaleDict( mLocaleDict );
-        } else {
-            QString fileName ;
-            if ( mPreferredLanguage == 4 ) 
-                fileName = MainWindow::resourcePath()+"usertranslation.txt"; 
-            else if ( mPreferredLanguage == 2 ) 
-                fileName = MainWindow::resourcePath()+"frenchtranslation.txt"; 
-            else if ( mPreferredLanguage == 3 ) 
-                fileName = MainWindow::resourcePath()+"italiantranslation.txt";
-            QFile file( fileName );
-            if (file.open( IO_ReadOnly ) ) {
-                QTextStream ts( &file );
-                ts.setEncoding( QTextStream::Latin1 );
-                //ts.setCodec( QTextCodec::latin1 );
-                QString  text = ts.read();
-                file.close();  
-                text.replace( QRegExp("\\\\n"), "\n" );
-                QString line;
-                QString we;
-                QString wt;
-                int br = 0;
-                int nbr;
-                nbr = text.find ( "},", br );
-                line = text.mid( br, nbr - br );
-                br = nbr+1;
-                int se, ee, st, et;
-                mLocaleDict = new QDict<QString>;
-                QString end = "{ \"\",\"\" }";
-                while ( (line != end) && (br > 1)  ) {
-                    //qDebug("%d *%s* ", br, line.latin1());
-                    se = line.find("\"")+1;
-                    et = line.findRev("\"",-1);
-                    ee = line.find("\",\"");
-                    st = ee+3;
-                    we = line.mid( se, ee-se );
-                    wt = line.mid( st, et-st );
-                    //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
-                    mLocaleDict->insert( we, new QString (wt) );
-                    nbr = text.find ( "}", br );
-                    line = text.mid( br, nbr - br );
-                    br = nbr+1;
-                }
-                //qDebug("end *%s* ", end.latin1());
-
-                setLocaleDict( mLocaleDict );
-            } else {
-                qDebug("KO: Cannot find translation file %s",fileName.latin1() );
-            }
-    
-        }
-    }
     config()->setGroup("General");
     
     mCustomCategories = config()->readListEntry("Custom Categories");
-    if ( KOPrefs::instance()->mLanguageChanged ) {
+    if ( KPimGlobalPrefs::instance()->mPreferredLanguage != mOldLanguage ) {
         mLocationDefaults.clear();
         mEventSummaryUser.clear();
         mTodoSummaryUser.clear();
     }
+    mOldLoadedLanguage = mOldLanguage ;
+    mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
    if (mLocationDefaults.isEmpty()) {
        mLocationDefaults << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
                          << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
                          << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index c74b0ef..0656644 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -22,11 +22,11 @@
 */
 #ifndef KOPREFS_H
 #define KOPREFS_H
 
-#include <qdict.h>
 
 #include <libkdepim/kpimprefs.h>
+#include <qdict.h>
 
 class KConfig;
 class QFont;
 class QColor;
@@ -69,9 +69,8 @@ class KOPrefs : public KPimPrefs
     object. */
     KOPrefs();
 
     static KOPrefs *mInstance;
-    QDict<QString> *mLocaleDict;
     QStringList getDefaultList();
   public:
     // preferences data
     KConfig* getConfig();
@@ -157,9 +156,8 @@ class KOPrefs : public KPimPrefs
     int     mNextXDays;
     int     mWhatsNextDays;
     int     mWhatsNextPrios;
     bool    mEnableQuickTodo;
-    bool    mLanguageChanged;
 
     bool    mCompactDialogs;
     bool    mVerticalScreen;
 
@@ -252,23 +250,15 @@ class KOPrefs : public KPimPrefs
     int mAlarmPlayBeeps;
     int mAlarmSuspendTime;
     int mAlarmSuspendCount;
     int mAlarmBeepInterval;
+    int mOldLanguage;
+    int mOldLoadedLanguage;
 
   
     QString mActiveSyncPort;
     QString mActiveSyncIP;
 
-
-    //US I copied the following settings into KPimGlobalPrefs
-    // that allows us later to easily remove the settings from here.
-    int mPreferredDate;
-    QString mUserDateFormatLong;
-    QString mUserDateFormatShort;
-    int mPreferredLanguage;
-    int mPreferredTime;
-    bool mWeekStartsOnSunday;
-
   private:
     QDict<QColor> mCategoryColors;
     QColor mDefaultCategoryColor;
 
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index cf07a1a..f5a1c50 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -30,8 +30,9 @@
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
+#include <kpimglobalprefs.h>
 
 #include "ktimeedit.h"
 #include "koprefs.h"
 #include <qvalidator.h>
@@ -110,9 +111,9 @@ KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
   connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int)));
   connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText()));
   QFontMetrics fm ( font() );
   QString timeString = "24:00";
-  if ( KOPrefs::instance()->mPreferredTime == 1 )
+  if ( KPimGlobalPrefs::instance()->mPreferredTime == 1 )
       timeString = "02:00pm";
   int addSpace = 32;
   if ( QApplication::desktop()->width() > 320 )
       timeString += ":00";
@@ -237,9 +238,9 @@ void KOTimeEdit::setSelect( int from, int to )
 void KOTimeEdit::keyPressEvent(QKeyEvent *e)
 {
 
   qApp->processEvents();
-  bool hour12Format =  ( KOPrefs::instance()->mPreferredTime == 1 );
+  bool hour12Format =  ( KPimGlobalPrefs::instance()->mPreferredTime == 1 );
   int maxpos = hour12Format?7:5;
   if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
     e->ignore();
     // qDebug("  ignore  %d",e->isAutoRepeat()  );
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index fbfcd20..dc2026b 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -224,12 +224,11 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     mView->openCalendar( defaultFileName() );
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
-    if ( KOPrefs::instance()->mLanguageChanged ) {
+    if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setCategoryDefaults();
         int count = mView->addCategories();
-        KOPrefs::instance()->mLanguageChanged = false;
     }
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );