[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/kverbos/kverbos
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2004-07-04 3:42:47
Message-ID: 20040704034247.0F5959447 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

make the user's language a KConfig compiler option


  A            kverbos.kcfg   1.1
  A            prefs.kcfgc   1.1
  A            data/.cvsignore   1.1
  A            data/de/.cvsignore   1.1
  A            data/en/.cvsignore   1.1
  M +2 -0      .cvsignore   1.4
  M +2 -1      Makefile.am   1.15
  M +3 -9      kverbos.cpp   1.30


--- kdeedu/kverbos/kverbos/.cvsignore  #1.3:1.4
@@ -15,2 +15,4 @@
 qverbosoptions.cpp
 qverbosoptions.h
+prefs.cpp
+prefs.h

--- kdeedu/kverbos/kverbos/Makefile.am  #1.14:1.15
@@ -2,5 +2,5 @@
 
 bin_PROGRAMS = kverbos
-kverbos_SOURCES = kfeedercontrol.cpp kresult.cpp qresult.ui verbspanish.cpp \
kverbosuser.cpp kerfassen.cpp qerfassen.ui kverbedit.cpp qverbedit.ui \
qverbosoptions.ui kverbosoptions.cpp qlernen.ui kstartuplogo.cpp kverbosview.cpp \
kverbosdoc.cpp kverbos.cpp main.cpp  +kverbos_SOURCES = kfeedercontrol.cpp \
kresult.cpp qresult.ui verbspanish.cpp kverbosuser.cpp kerfassen.cpp qerfassen.ui \
kverbedit.cpp qverbedit.ui qverbosoptions.ui kverbosoptions.cpp qlernen.ui \
kstartuplogo.cpp kverbosview.cpp kverbosdoc.cpp kverbos.cpp main.cpp prefs.kcfgc  \
kverbos_LDADD   =  $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)  
@@ -9,4 +9,5 @@
 
 xdg_apps_DATA = kverbos.desktop
+kde_kcfg_DATA = kverbos.kcfg
 
 pics_DATA = startuplogo.png

--- kdeedu/kverbos/kverbos/kverbos.cpp  #1.29:1.30
@@ -38,4 +38,5 @@
 #include "kresult.h"
 #include "kfeedercontrol.h"
+#include "prefs.h"
 
 // ID Nummern für die Statuszeile
@@ -420,12 +421,5 @@ void KVerbosApp::slotFileOpenStandard()
 {
         slotStatusMsg(i18n("Opening file..."));
-        //get the user language
-        KConfigBase *globalConf = KGlobal::config();
-        globalConf->setGroup("Locale");
-        QString userLanguage = globalConf->readEntry("Language", "en");
-        //keep only the first 2 characters
-        userLanguage = userLanguage.left(2);
-        if (userLanguage!="de") 
-                userLanguage = "en";
+        QString userLanguage = Prefs::userLanguage();
         if(!doc->saveModified())
         {
@@ -738,5 +732,5 @@ void KVerbosApp::slotSettingsUsername()
         bool ok;
         QString n = KInputDialog::getText(i18n("Enter User Name"), i18n("Please \
                enter your name:"),
-                         "", &ok, this).simplifyWhiteSpace();
+                        QString::null , &ok, this).simplifyWhiteSpace();
         if (ok)
         {


[prev in list] [next in list] [prev in thread] [next in thread]