[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-08 14:29:10
Message-ID: 20050408142910.7F56B63E () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

some cleaning


  M +13 -14    khangman.cpp   1.170
  M +2 -22     khangmanview.cpp   1.96


--- kdeedu/khangman/khangman/khangman.cpp  #1.169:1.170
@@ -51,5 +51,5 @@ KHangMan::KHangMan()
 
     loadSettings();
-    //loadLevels();
+    loadLevels();
     //setupToolbars();
     connect(m_view, SIGNAL(signalKvtml(bool)), this, SLOT(enableHint(bool)));
@@ -106,14 +106,12 @@ void KHangMan::slotChangeLevel()
 {
     static const char *levelStrings[] = {
+        I18N_NOOP("Animals"),
         I18N_NOOP("Easy"),
-        I18N_NOOP("Medium"),
         I18N_NOOP("Hard"),
-        I18N_NOOP("Animals"),
+        I18N_NOOP("Medium"),
     };
-   // currentLevel = levelAct->currentItem();
-   // levelString = levels[currentLevel];
-    //levelString.replace(0, 1, levelString.left(1).lower());
-    
-    //m_view->levelFile = levelString +".kvtml";
+    currentLevel = levelAct->currentItem();
+    levelString = levels[currentLevel];
+    levelString.replace(0, 1, levelString.left(1).lower());
     changeStatusbar(i18n(levelStrings[1]), IDS_LEVEL);
    // if (m_view->levelFile == "world_capitals.kvtml" || m_view->levelFile == "departements.kvtml")
@@ -122,6 +120,6 @@ void KHangMan::slotChangeLevel()
    //     changeStatusbar("", IDS_ACCENTS);
     //Prefs::setLevel( currentLevel);
-    //Prefs::setLevelFile(m_view->levelFile);
-    //Prefs::writeConfig();
+    Prefs::setLevelFile(levelString +".kvtml");
+    Prefs::writeConfig();
     m_view->slotNewGame();
 }
@@ -214,8 +212,6 @@ void KHangMan::setLevel()
     levelString = levels[currentLevel];
     levelString.replace(0, 1, levelString.left(1).lower());
-    //levelString = levels[currentLevel].replace(0, 1, levels[currentLevel].left(1).lower()) ;
+    levelString = levels[currentLevel].replace(0, 1, levels[currentLevel].left(1).lower()) ;
    // m_view->levelFile = levelString +".kvtml";
-    //update the Levels in Level combobox as well
-   // setLevel_WindowState();
 }
 
@@ -250,8 +246,11 @@ void KHangMan::loadLevels()
     }
     kdDebug() << "Levels: " << levels << endl;
+    
     QStringList translatedLevels;
     for (QStringList::Iterator it = levels.begin(); it != levels.end(); ++it )
         translatedLevels+=i18n((*it).utf8());
     levelAct->setItems(translatedLevels);
+    
+    //TODO set the current level in levelAct
 }
 

--- kdeedu/khangman/khangman/khangmanview.cpp  #1.95:1.96
@@ -493,29 +493,9 @@ void KHangManView::game()
         //detects if file is a kvtml file so that it's a hint enable file
         if (allData.first() == "<?xml version=\"1.0\"?>") {
-            emit(signalKvtml(true));
             readFile();
         }
         else {//TODO abort if not a kvtml file maybe
-            if (allData.count()<=1) {
-                emit(signalChangeLanguage(3));
-                return;
+        kdDebug() << "Not a kvtml file!" << endl;
             }
-            emit(signalKvtml(false));
-            //now the calculations...
-            int objects = allData.count();//number of words in the file
-            //picks a random word from allData
-            while (word.isEmpty())
-                word = allData[random.getLong(objects)]; //gives us a single word...
-            //test if the word is not the same than the previous one
-            if (temp.isEmpty())
-                    temp=word;
-            else {
-                while (word.lower()==temp.lower())
-                    word = allData[random.getLong(objects)];
-                temp=word;
-            }//end of test
-            if (!upperBool)
-                word = word.lower(); //because of German
-        }//end else if language=fr
         kdDebug() << word << endl;
         //display the number of letters to guess with _


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