From 3998a23f848b849d93deeb36108734592027fcc9 Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand.private.network>
Date: Tue, 29 Jun 2010 18:26:37 -0700
Subject: [PATCH] add undo button; reorder menus; fix show-values menuitem

---
 xwords4/android/XWords4/res/drawable/undo.png | Bin 0 -> 1478 bytes
 xwords4/android/XWords4/res/layout/board.xml  |  16 ++++++--
 .../android/XWords4/res/menu/board_menu.xml   |  37 ++++++++----------
 .../eehouse/android/xw4/BoardActivity.java    |  23 +++++++----
 4 files changed, 44 insertions(+), 32 deletions(-)
 create mode 100644 xwords4/android/XWords4/res/drawable/undo.png

diff --git a/xwords4/android/XWords4/res/drawable/undo.png b/xwords4/android/XWords4/res/drawable/undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..487b5bd58a1d0eeaf29870e8b78adb7cc9dd8005
GIT binary patch
literal 1478
zcmV;%1v&bOP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igW6
z0SqQTjo>2y00l-#L_t(&-qo2+Y*bYg$A9<DOiIJN(qM}YLT%^=ZAKG9F`^rAW1>rO
zp@~sf)TLi>L87uShD5-`Xbi42!H*4UL}P*`;s!~Y60{40bfm4JNJ9acp$P5FanUo)
z<MqA!?#xu7C%Ngo-h0oz|9igfIoF5?%bC)(3^vB(fGpqxMW7@i=WZzi5pilj4mbb|
z0iu5o06AA4|3zE$58s%D76PzWHy&<#ZzTZFCY=`VrtWPq!?xXaHc%AV4%`ED8e_(Q
zaiBkjN53)V-s)6fT0~0!7XTCVLM@(G-TWIsr?xTRFJPUvFkJv{=<i|RGvM%^J$p(3
z>2w;S>X^x7$Y!&&x3`na<!EhfrKhK-6WF8&h91_*iHV7^_3PKyC4pyw?Sbzqkbk0l
z0MHirUaQ~JZEbBwGMNmSOono~%*@OTgM)+N`JKQn;8CDm`Aq>|b#!#RBO+rpc_H5z
zfHN`1>e|i%JIBYz3APw|S=BDg;{xz}&0c7U0L%ej0*?S$%jN-&$MC2CpE?5o)&MU7
zpQye!0-yq11dahuY2b^azb$-DI>sl~0K0YLCEdU*a9tUlNmyuBPd%#d>ws}a(RB;o
zao0G|0z3@d39JN+8h2Smyc@7x7p7EaD-nGIdhLkyg0?W^;zm6c@jyghlb-I!YG`pZ
zsn?3RI^6gTOW%s2p&=&#*MNzLzH7jrjvE<{0XYm53xz^G0MboOO^l3;BmyV`CnEYv
zx&aqD415p#uA7<!e%7EiEh3DLj)v!Cb^TcN@;r~`=H|peb{^QT-<yFB-T05dLH+-%
zg~zOK%y3a;FVL&OX<8%rvD2qdmtt~`I{@46D(UomoGlazbaiz_0}zq2G3FQGRW-O~
zJ^d?cpia@;H)c3WVwQwyLqa}MNu^TE&CQX?WUMNLh?GTSQbbPq#+>wx8TE|`ZvKj8
zp*|bBfsGq)^4S4eo#2ILgY)9-$aB>33+kJr$S;a~XPdmGuP+KfYXSgIL>4ZBRtY$I
z8C&wawJ2hXxZL00AGNk51UZZ`iC)NsPN=cRQL9GuTBs?Ze>O(->H_c^aKv`0Rqs;^
zRTBCyhwnU%0GI;ySr#?G14&H$1a%0}Om*`%HS%g;I09U@^gmIf1ny2S;=X)7zbT*3
zr)*O2YCN&Cmf^icky_Mfbwd9N;3%-8x3@P{w**2Uj#`Fhfvq(F=yn*h3U~|1cXxL;
ztU>@^SZ<w?RAMRKtOmV~Yi<B`E`<$LB`{?%<SqvuDd2Ur0jJ6d@N`1}LTWVGfL^D7
z7lBvww=1nO#=M&dAXJH~hnkBbwvF8fyq1uq#d<koOtw)K0=Q(k0<6>2G>+bPO%)^P
zF5sc108p@L8}Md~0q=A0QWq0!;hDt3maQp0sZ}~#X{8*f5tTK9CzWF^0Xu-JmN6xu
z)44irDMtP3kZV_s)=P-ED9HW3F^9A$7Dp?Yf0L+B0s$!uI-aU)A?$|$|Hn0jjT?WB
zz@tjd00JPUmI%NpAQ#}hR<G{1ISVgCb@@$Q=!1l0--WIMyL@AUg|qX(PYLrjS4)<S
zIR3YR&jZ!vdWu>f0f&ND4BwbC@NGiAuw@~Z)T2THac8v(eUSNwiK^F`3wWVQz+Nia
z{|E3wSgIku$1N%}1oVi=;uo5FsAy077Cp`S#+(b!318idB98&@X`Lz@-9H3&i^#bJ
z084O<Xb5yvwx-Wr&jAlAka6G}U|;op`j!D`l&(}NG-|}R1*OA?mYXz;tz=Ovkl-QQ
g766t5EqfdI7b-XYGhKs~I{*Lx07*qoM6N<$f)_8C;{X5v

literal 0
HcmV?d00001

diff --git a/xwords4/android/XWords4/res/layout/board.xml b/xwords4/android/XWords4/res/layout/board.xml
index dbaab54fb..efc1d15cc 100644
--- a/xwords4/android/XWords4/res/layout/board.xml
+++ b/xwords4/android/XWords4/res/layout/board.xml
@@ -49,6 +49,10 @@
                  style="@style/toolbar_button"
     	         android:src="@drawable/zoom"
                  />
+   	<ImageButton android:id="@+id/undo_button_horizontal"
+                 style="@style/toolbar_button"
+    	         android:src="@drawable/undo"
+                 />
     </LinearLayout>
   </LinearLayout>
 
@@ -69,14 +73,18 @@
                  style="@style/toolbar_button"
     	         android:src="@drawable/shuffle"
                  />
-   	<ImageButton android:id="@+id/flip_button_vertical"
-                 style="@style/toolbar_button"
-    	         android:src="@drawable/flip"
-                 />
    	<ImageButton android:id="@+id/zoom_button_vertical"
                  style="@style/toolbar_button"
     	         android:src="@drawable/zoom"
                  />
+   	<ImageButton android:id="@+id/undo_button_vertical"
+                 style="@style/toolbar_button"
+    	         android:src="@drawable/undo"
+                 />
+   	<ImageButton android:id="@+id/flip_button_vertical"
+                 style="@style/toolbar_button"
+    	         android:src="@drawable/flip"
+                 />
   </LinearLayout>
 
 </LinearLayout>
diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/XWords4/res/menu/board_menu.xml
index 2359320b9..757783d4e 100644
--- a/xwords4/android/XWords4/res/menu/board_menu.xml
+++ b/xwords4/android/XWords4/res/menu/board_menu.xml
@@ -5,31 +5,35 @@
     <!--       android:title="@string/board_menu_juggle"  -->
     <!--       android:alphabeticShortcut="J" -->
     <!--       /> -->
+
+    <item android:id="@+id/board_menu_done"
+          android:title="@string/board_menu_done"
+          android:alphabeticShortcut="D"
+          />
+
     <item android:id="@+id/board_menu_trade"
           android:title="@string/board_menu_trade"
           android:alphabeticShortcut="T"
           />
-    <item android:title="@string/board_submenu_undo">
-      <menu>
-        <item android:id="@+id/board_menu_undo_current"
-              android:title="@string/board_menu_undo_current"
-              />
-        <item android:id="@+id/board_menu_undo_last"
-              android:title="@string/board_menu_undo_last"
-              android:alphabeticShortcut="U"
-              />
-      </menu>
-    </item>
+    <item android:id="@+id/board_menu_undo_last"
+          android:title="@string/board_menu_undo_last"
+          android:alphabeticShortcut="U"
+          />
+
     <item android:id="@+id/board_menu_tray"
           android:title="@string/board_menu_tray" 
           android:alphabeticShortcut="H"
           />
-
     <!-- <item android:id="@+id/board_menu_flip" -->
     <!--       android:title="@string/board_menu_flip" -->
     <!--       android:alphabeticShortcut="F" -->
     <!--       /> -->
 
+    <item android:id="@+id/board_menu_values"
+          android:title="@string/board_menu_values"
+          android:alphabeticShortcut="V"
+          />
+
     <item android:title="@string/board_submenu_game">
       <menu>
         <item android:id="@+id/board_menu_game_counts"
@@ -54,18 +58,9 @@
               android:title="@string/board_menu_hint_next" 
               android:alphabeticShortcut="H"
               />
-        <item android:id="@+id/board_menu_values"
-              android:title="@string/board_menu_values"
-              android:alphabeticShortcut="V"
-              />
       </menu>
     </item>
 
-    <item android:id="@+id/board_menu_done"
-          android:title="@string/board_menu_done"
-          android:alphabeticShortcut="D"
-          />
-
     <item android:id="@+id/board_menu_file_prefs"
           android:title="@string/menu_prefs"
           android:alphabeticShortcut="P"
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
index d1c166ef0..4e9c60076 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardActivity.java
@@ -422,9 +422,9 @@ public class BoardActivity extends Activity implements UtilCtxt {
         case R.id.board_menu_tray:
             cmd = JNIThread.JNICmd.CMD_TOGGLE_TRAY;
             break;
-        case R.id.board_menu_undo_current:
-            cmd = JNIThread.JNICmd.CMD_UNDO_CUR;
-            break;
+        // case R.id.board_menu_undo_current:
+        //     cmd = JNIThread.JNICmd.CMD_UNDO_CUR;
+        //     break;
         case R.id.board_menu_undo_last:
             cmd = JNIThread.JNICmd.CMD_UNDO_LAST;
             break;
@@ -434,9 +434,9 @@ public class BoardActivity extends Activity implements UtilCtxt {
         case R.id.board_menu_hint_next:
             cmd = JNIThread.JNICmd.CMD_NEXT_HINT;
             break;
-        // case R.id.board_menu_values:
-        //     cmd = JNIThread.JNICmd.CMD_VALUES;
-        //     break;
+        case R.id.board_menu_values:
+            cmd = JNIThread.JNICmd.CMD_VALUES;
+            break;
 
         case R.id.board_menu_game_counts:
             m_jniThread.handle( JNIThread.JNICmd.CMD_COUNTS_VALUES,
@@ -788,7 +788,16 @@ public class BoardActivity extends Activity implements UtilCtxt {
             };
         bindButtons( listener, R.id.zoom_button_horizontal,
                      R.id.zoom_button_vertical );
-    }
+
+        listener = new View.OnClickListener() {
+                @Override
+                public void onClick( View view ) {
+                    m_jniThread.handle( JNIThread.JNICmd.CMD_UNDO_CUR );
+                }
+            };
+        bindButtons( listener, R.id.undo_button_horizontal,
+                     R.id.undo_button_vertical );
+    } // populateToolbar
 
     private DialogInterface.OnDismissListener makeODLforBlocking()
     {