[Picross-commit] SF.net SVN: picross:[127] branches/engine_split

[<yva...@us...>]

Revision: 127
          http://sourceforge.net/p/picross/code/127
Author:   yvan_norsa
Date:     2013-01-17 09:03:17 +0000 (Thu, 17 Jan 2013)
Log Message:
-----------
better menus

Modified Paths:
--------------
    branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameController.java
    branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameUI.java
    branches/engine_split/android/src/picross/specific/game/ui/GameController.java
    branches/engine_split/android/src/picross/specific/game/ui/GameUI.java
    branches/engine_split/android/src/picross/specific/ui/PicrossEvent.java
    branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java
    branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java

Modified: branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameController.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameController.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameController.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -37,6 +37,9 @@
 
 import picross.specific.ui.PicrossEvent;
 
+import picross.engine.PicrossLogger;
+import picross.engine.PicrossLogHelper;
+
 /**
  * Controller for the random game UI.
  *
@@ -52,6 +55,8 @@
     /** Random game command. */
     static final String RANDOM_GAME_CMD = "RANDOM_GAME_CMD";
 
+    private static PicrossLogger log = PicrossLogHelper.getLogger(RandomGameController.class);
+
     /*** Method overloaded from the class Controller ***/
 
     /** {@inheritDoc} */
@@ -73,6 +78,8 @@
 
     @Override
     public void onPicrossEvent(PicrossEvent e) {
+        RandomGameController.log.debug("onPicrossEvent(" + e + ")");
+
         int itemId = e.getItemId();
 
         if (itemId == RandomGameController.NEXT_CMD_ID) {

Modified: branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameUI.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/android/src/picross/specific/game/random/ui/RandomGameUI.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -84,10 +84,6 @@
     public void populateOptionsMenu(Menu menu) {
         super.populateOptionsMenu(menu);
 
-        if (menu.findItem(RandomGameController.NEXT_CMD_ID) != null) {
-            return;
-        }
-
         menu.add(Menu.NONE, RandomGameController.NEXT_CMD_ID, Menu.NONE, BundleHelper.getString(this, "anotherGrid"));
     }
 }

Modified: branches/engine_split/android/src/picross/specific/game/ui/GameController.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/ui/GameController.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/android/src/picross/specific/game/ui/GameController.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -42,6 +42,7 @@
 import picross.common.ui.PicrossController;
 
 import picross.specific.ui.MenuController;
+import picross.specific.ui.PicrossEvent;
 
 /**
  * Controller for the game.
@@ -54,6 +55,8 @@
     /** The class' logger. */
     private static PicrossLogger log = PicrossLogHelper.getLogger(GameController.class);
 
+    public static final int QUIT_CMD_ID = PicrossController.QUIT_CMD.hashCode();
+
     /*** Method overloaded from the class Controller ***/
 
     /** {@inheritDoc} */
@@ -77,5 +80,19 @@
         }
     }
     */
+
+    @Override
+    public void onPicrossEvent(PicrossEvent e) {
+        GameController.log.debug("onPicrossEvent(" + e + ")");
+
+        int itemId = e.getItemId();
+
+        if (itemId == GameController.QUIT_CMD_ID) {
+            this.fireEventPerformed(PicrossController.QUIT_CMD);
+            return;
+        }
+
+        super.onPicrossEvent(e);
+    }
 }
 

Modified: branches/engine_split/android/src/picross/specific/game/ui/GameUI.java
===================================================================
--- branches/engine_split/android/src/picross/specific/game/ui/GameUI.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/android/src/picross/specific/game/ui/GameUI.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -178,7 +178,9 @@
     }
 
     public void populateOptionsMenu(Menu menu) {
-        GameUI.log.debug("TODO options menu");
+        menu.clear();
+
+        menu.add(Menu.NONE, GameController.QUIT_CMD_ID, Menu.NONE, BundleHelper.getString(this, "menuButton"));
     }
 
     public boolean onOptionsItemSelected(MenuItem item) {

Modified: branches/engine_split/android/src/picross/specific/ui/PicrossEvent.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossEvent.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossEvent.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -52,5 +52,10 @@
     public int getItemId() {
         return this.itemId;
     }
+
+    @Override
+    public String toString() {
+        return "[PicrossEvent: actionCommand=\"" + this.actionCommand + "\", itemId=\"" + this.itemId + "\"]";
+    }
 }
 

Modified: branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java
===================================================================
--- branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/android/src/picross/specific/ui/PicrossMediator.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -118,6 +118,12 @@
 
     private GameUI gameView;
 
+    @Override
+    protected void quitGame() {
+        this.gameView = null;
+        super.quitGame();
+    }
+
     /**
      * Method launching a game.
      *
@@ -143,6 +149,7 @@
 
     public boolean populateOptionsMenu(Menu menu) {
         if (this.gameView == null) {
+            menu.clear();
             return false;
         }
 

Modified: branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java
===================================================================
--- branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java	2013-01-16 13:19:28 UTC (rev 126)
+++ branches/engine_split/common/src/picross/common/ui/AbstractPicrossMediator.java	2013-01-17 09:03:17 UTC (rev 127)
@@ -153,11 +153,15 @@
         }
 
         if (cmd.equals(PicrossController.QUIT_CMD)) {
-            this.displayGameMenu();
+            this.quitGame();
             return;
         }
     }
 
+    protected void quitGame() {
+        this.displayGameMenu();
+    }
+
     /*** Methods ***/
 
     /** Exits the application. */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.