[Jrisk-cvs] SF.net SVN: domination-code:[2626] Domination/sharedUI

[<yu...@us...>]

Revision: 2626
          http://sourceforge.net/p/domination/code/2626
Author:   yuranet
Date:     2025-01-25 13:29:16 +0000 (Sat, 25 Jan 2025)
Log Message:
-----------
update mini game setup to use standard close command

Modified Paths:
--------------
    Domination/sharedUI/res_mini_game_ui/newgame.xml
    Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameSetup.java

Modified: Domination/sharedUI/res_mini_game_ui/newgame.xml
===================================================================
--- Domination/sharedUI/res_mini_game_ui/newgame.xml	2025-01-25 11:59:59 UTC (rev 2625)
+++ Domination/sharedUI/res_mini_game_ui/newgame.xml	2025-01-25 13:29:16 UTC (rev 2626)
@@ -53,7 +53,7 @@
         </panel>
     </panel>
     <panel bottom="5" gap="5" left="5" right="5" top="5">
-        <button action="closegame" i18n="true" name="cancelButton" property="plafname=SmallButton" text="newgame.cancel" type="cancel" weightx="1" width="1"/>
+        <button action="close" i18n="true" name="cancelButton" property="plafname=SmallButton" text="newgame.cancel" type="cancel" weightx="1" width="1"/>
         <button action="startgame" i18n="true" name="startButton" property="plafname=SmallButton" text="newgame.startgame" weightx="1" width="1"/>
     </panel>
 </panel>

Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameSetup.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameSetup.java	2025-01-25 11:59:59 UTC (rev 2625)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameSetup.java	2025-01-25 13:29:16 UTC (rev 2626)
@@ -58,6 +58,7 @@
         myrisk = risk;
         this.controller = controller;
         setMaximum(true);
+        addWindowListener(this);
 
         setBorder(MainMenu.background);
         setBackground( 0x00FFFFFF );
@@ -76,7 +77,7 @@
     @Override
     public void actionPerformed(String actionCommand) {
 
-            if ("closegame".equals(actionCommand)) {
+            if (CMD_CLOSE.equals(actionCommand)) {
                 GameSound.INSTANCE.playSound(GameSound.BACK_BUTTON);
             }
             else if (!"startgame".equals(actionCommand)) {
@@ -83,7 +84,7 @@
                 GameSound.INSTANCE.playSound(GameSound.BUTTON);
             }
 
-            if ("closegame".equals(actionCommand)) { // user clicks back in game setup screen
+            if (CMD_CLOSE.equals(actionCommand)) { // user clicks back in game setup screen
         	if (localgame) {
         	    myrisk.parser("closegame");
         	}