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

List:       kde-commits
Subject:    kdeedu/khangman/khangman
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2005-04-10 20:32:26
Message-ID: 20050410203226.D85D2495 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

fix level when load settings and change language


  M +4 -8      khangman.cpp   1.174
  M +1 -1      khangmanview.cpp   1.97


--- kdeedu/khangman/khangman/khangman.cpp  #1.173:1.174
@@ -204,6 +204,4 @@ void KHangMan::loadSettings()
             selectedLanguage = "en";
     changeStatusbar(m_languageNames[m_languages.findIndex(Prefs::selectedLanguage())], IDS_LANG);
-    // Level
-
 }
 
@@ -253,20 +251,18 @@ void KHangMan::loadLevels()
     {
         Prefs::setLevelFile(levels[0].replace(0, 1, levels[0].left(1).lower())+".kvtml");
+        Prefs::setCurrentLevel(0);
         currentLevel =0;
         Prefs::writeConfig();
     }    
-    Prefs::setCurrentLevel(currentLevel);
-    Prefs::writeConfig();
     QStringList translatedLevels;
     for (QStringList::Iterator it = levels.begin(); it != levels.end(); ++it )
         translatedLevels+=i18n((*it).utf8());
-
-    levelAct->setCurrentItem(currentLevel);
     levelAct->setItems(translatedLevels);
     levelAct->setCurrentItem(Prefs::currentLevel());
 
-    changeStatusbar(i18n(levels[currentLevel].utf8()), IDS_LEVEL);
-    
     setLevel();
+    QString m_lstring = translatedLevels[currentLevel].utf8();
+    m_lstring.replace(0, 1, m_lstring.left(1).upper());
+    changeStatusbar(m_lstring, IDS_LEVEL);
 }
 

--- kdeedu/khangman/khangman/khangmanview.cpp  #1.96:1.97
@@ -473,5 +473,5 @@ void KHangManView::game()
         kdDebug() << "level " << Prefs::levelFile() << endl;
         QFile myFile;
-        myFile.setName(locate("data",myString));
+        myFile.setName(locate("data", myString));
         if (!myFile.exists())
         {


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