[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-16 1:37:40
Message-ID: 20050416013740.F2CAB633 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

KNewStuff action
uppercase TODO


  M +12 -0     khangman.cpp   1.178
  M +21 -10    khangman.h   1.78
  M +2 -2      khangmanview.cpp   1.118
  M +9 -2      khnewstuff.cpp   1.7


--- kdeedu/khangman/khangman/khangman.cpp  #1.177:1.178
@@ -23,4 +23,5 @@
 #include "prefs.h"
 #include "advanced.h"
+#include "khnewstuff.h"
 
 #include <qcheckbox.h>
@@ -45,4 +46,5 @@ KHangMan::KHangMan()
       m_view(new KHangManView(this))
 {
+    mNewStuff = 0;
     // tell the KMainWindow that this is indeed the main widget
     setCentralWidget(m_view);
@@ -297,3 +299,13 @@ void KHangMan::optionsPreferences()
 }
 
+//TODO refresh language menu after hot new stuff
+void KHangMan::slotDownloadNewStuff()
+{
+    if ( !mNewStuff )
+        mNewStuff = new KHNewStuff( m_view );
+    mNewStuff->download();
+}
+
+//TODO special toolbar chars in upperCase if Prefs::upperCase()
+
 #include "khangman.moc"

--- kdeedu/khangman/khangman/khangman.h  #1.77:1.78
@@ -33,4 +33,5 @@
 class KSelectAction;
 class KToggleAction;
+class KHNewStuff;
 
 /**
@@ -59,4 +60,12 @@ public:
     */
     void changeStatusbar(const QString& text, int id);
+    ///Action that sets up the Language menu
+    KSelectAction *m_languageAction;
+    ///Method to set the current language into the Statusbar and to pass it to \
KHangManView +    void setLanguages();
+    ///Translated names of languages
+    QStringList m_languageNames;
+    ///Language codes of available languages
+    QStringList m_languages;
 
 protected:
@@ -69,6 +78,5 @@ protected:
     ///Populate the Languages menu
     QPopupMenu *langPopup;
-    ///Action that sets up the Language menu
-    KSelectAction *m_languageAction;
+
 
     void setupActions();
@@ -78,12 +86,8 @@ protected:
     ///Selected language
     QString selectedLanguage;
-    ///Translated names of languages
-    QStringList m_languageNames;
-    ///Language codes of available languages
-    QStringList m_languages;
+
     ///Translated and sorted names of languages
     QStringList m_sortedNames;
-    ///Method to set the current language into the Statusbar and to pass it to \
                KHangManView
-    void setLanguages();
+
     ///the different data files in each language dir
     QStringList levels;
@@ -99,4 +103,10 @@ protected:
     void loadLevels();
 private:
+    ///Create a KNewStuff instance
+    KHNewStuff *mNewStuff;
+
+public slots:
+
+    void slotChangeLanguage(int);
 
 protected slots:
@@ -104,9 +114,10 @@ protected slots:
     void slotChangeLevel();
 
-    void slotChangeLanguage(int);
     
     void slotChangeMode();
     ///In Settings menu, Configure KHangMan... menu item
     void optionsPreferences();
+    ///access the KNewStuff class to install new data
+    void slotDownloadNewStuff();
 };
 

--- kdeedu/khangman/khangman/khangmanview.cpp  #1.117:1.118
@@ -384,5 +384,5 @@ void KHangManView::slotTry()
       //  upperBool = true;
     //if ((!upperBool))
-    if (Prefs::upperCase())
+    if (Prefs::upperCase()) //TODO see if it's OK in all languages for all special \
chars  sChar = sChar.upper();
     else
@@ -697,5 +697,5 @@ void KHangManView::readFile()
     }
     if (Prefs::upperCase())
-        word = word.upper();
+        word = word.upper();//TODO see if it's OK in all languages for all special \
chars  }
 

--- kdeedu/khangman/khangman/khnewstuff.cpp  #1.6:1.7
@@ -29,4 +29,5 @@
 #include <kaction.h>
 
+#include "prefs.h"
 #include "khnewstuff.h"
 
@@ -50,4 +51,10 @@ bool KHNewStuff::install( const QString 
     archiveDir->copyTo(destDir);
     archive.close();
+        //look for languages dirs installed
+    m_view->khangman->setLanguages();
+    //refresh Languages menu
+    m_view->khangman->m_languageAction->setItems(m_view->khangman->m_languageNames);
+    m_view->khangman->slotChangeLanguage(m_view->khangman->m_languages.findIndex(Prefs::selectedLanguage()));
 +    m_view->khangman->m_languageAction->setCurrentItem(m_view->khangman->m_languages.findIndex(Prefs::selectedLanguage()));
  return true;
 }


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