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

List:       kde-commits
Subject:    kdegames/ktuberling
From:       Dominik Seichter <domseichter () web ! de>
Date:       2003-03-02 20:25:10
[Download RAW message or body]

CVS commit by domseichter: 

fixed bug 51494


  M +1 -1      playground.cpp   1.20
  M +11 -2     toplevel.cpp   1.56


--- kdegames/ktuberling/playground.cpp  #1.19:1.20
@@ -590,5 +590,5 @@ bool PlayGround::loadFrom(const QString 
     return false;
   }
-  change(newGameboard);
+  topLevel->changeGameboard(newGameboard);
 
   for (;;)

--- kdegames/ktuberling/toplevel.cpp  #1.55:1.56
@@ -151,6 +151,9 @@ void TopLevel::changeGameboard(uint newG
 {
   // Do not accept to switch to same gameboard
-  if (newGameboard == selectedGameboard)
+  if (newGameboard == selectedGameboard) {
+    // select this gameboard again
+    ((KToggleAction*) \
actionCollection()->action(gameboardActions[newGameboard].latin1()))->setChecked(true);
  return;
+  }
 
   // Unselect preceeding gameboard
@@ -161,4 +164,7 @@ void TopLevel::changeGameboard(uint newG
   writeOptions();
 
+  if( !((KToggleAction*) \
actionCollection()->action(gameboardActions[selectedGameboard].latin1()))->isChecked() \
) +    ((KToggleAction*) \
actionCollection()->action(gameboardActions[selectedGameboard].latin1()))->setChecked(true);
 +  
   // Change gameboard effectively
   playGround->change(newGameboard);
@@ -169,6 +175,9 @@ void TopLevel::changeLanguage(uint newLa
 {
   // Do not accept to switch to same language
-  if (newLanguage == selectedLanguage && soundEnabled)
+  if (newLanguage == selectedLanguage && soundEnabled) {
+    // newLanguage should stay checked
+    ((KToggleAction*) \
actionCollection()->action(languageActions[newLanguage].latin1()))->setChecked(true); \
return; +  }
 
   // Unselect preceeding language


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