From 71fe75049b0e8b990fc3b342224103a8d2b838a6 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Tue, 12 Jan 2010 13:18:16 +0000
Subject: [PATCH] new menus and shortcuts; tweak formatting

---
 .../XWords4/res/layout/game_config.xml        |  4 +-
 .../android/XWords4/res/menu/board_menu.xml   | 49 +++++++++++++------
 .../XWords4/res/menu/games_list_item_menu.xml | 30 ++++++++++--
 .../XWords4/res/menu/games_list_menu.xml      |  6 ++-
 .../android/XWords4/res/values/strings.xml    |  9 ++++
 5 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/game_config.xml b/xwords4/android/XWords4/res/layout/game_config.xml
index 6d83ec75f..d470f284b 100644
--- a/xwords4/android/XWords4/res/layout/game_config.xml
+++ b/xwords4/android/XWords4/res/layout/game_config.xml
@@ -43,11 +43,11 @@
      android:id="@+id/player_2_name"
      />
 
-  <Button android:id="@+id/game_config_open"
+  <!--Button android:id="@+id/game_config_open"
           android:layout_width="fill_parent" 
           android:layout_height="wrap_content" 
           android:layout_gravity="right"
-          android:text="@string/game_config_open" />
+          android:text="@string/game_config_open" /-->
 
   <Button android:id="@+id/game_config_done"
           android:layout_width="fill_parent" 
diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/XWords4/res/menu/board_menu.xml
index daa932fae..da0ba9bf5 100644
--- a/xwords4/android/XWords4/res/menu/board_menu.xml
+++ b/xwords4/android/XWords4/res/menu/board_menu.xml
@@ -2,31 +2,50 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/board_menu_done"
-          android:title="@string/board_menu_done" />
+          android:title="@string/board_menu_done"
+          android:alphabeticShortcut="D"
+          />
     <item android:id="@+id/board_menu_juggle"
-          android:title="@string/board_menu_juggle" />
+          android:title="@string/board_menu_juggle" 
+          android:alphabeticShortcut="J"
+          />
     <item android:id="@+id/board_menu_flip"
-          android:title="@string/board_menu_flip" />
+          android:title="@string/board_menu_flip"
+          android:alphabeticShortcut="F"
+          />
     <item android:id="@+id/board_menu_trade"
-          android:title="@string/board_menu_trade" />
+          android:title="@string/board_menu_trade"
+          android:alphabeticShortcut="T"
+          />
     <item android:id="@+id/board_menu_tray"
-          android:title="@string/board_menu_tray" />
-
+          android:title="@string/board_menu_tray" 
+          android:alphabeticShortcut="H"
+          />
     <item android:title="@string/board_submenu_undo">
       <menu>
         <item android:id="@+id/board_menu_undo_current"
-              android:title="@string/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:title="@string/board_menu_undo_last"
+              android:alphabeticShortcut="U"
+              />
       </menu>
     </item>
 
     <item android:title="@string/board_submenu_hint">
       <menu>
         <item android:id="@+id/board_menu_hint_next"
-              android:title="@string/board_menu_hint_next" />
+              android:title="@string/board_menu_hint_next" 
+              android:alphabeticShortcut="H"
+              />
         <item android:id="@+id/board_menu_hint"
-              android:title="@string/board_menu_hint" />
+              android:title="@string/board_menu_hint"
+              />
+        <item android:id="@+id/board_menu_values"
+              android:title="@string/board_menu_values"
+              android:alphabeticShortcut="V"
+              />
       </menu>
     </item>
     <item android:title="@string/board_submenu_game">
@@ -47,12 +66,14 @@
     </item>
     <item android:title="@string/board_submenu_file">
       <menu>
-        <item android:id="@+id/board_menu_file_new"
-              android:title="@string/board_menu_file_new" />
         <item android:id="@+id/board_menu_file_prefs"
-              android:title="@string/board_menu_file_prefs" />
+              android:title="@string/board_menu_file_prefs"
+              android:alphabeticShortcut="P"
+              />
         <item android:id="@+id/board_menu_file_about"
-              android:title="@string/board_menu_file_about" />
+              android:title="@string/board_menu_file_about"
+              android:alphabeticShortcut="A"
+              />
       </menu>
     </item>
 
diff --git a/xwords4/android/XWords4/res/menu/games_list_item_menu.xml b/xwords4/android/XWords4/res/menu/games_list_item_menu.xml
index 56ca860e6..c91fdfa65 100644
--- a/xwords4/android/XWords4/res/menu/games_list_item_menu.xml
+++ b/xwords4/android/XWords4/res/menu/games_list_item_menu.xml
@@ -2,11 +2,33 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/list_item_open"
-          android:title="@string/list_item_open" />
+          android:title="@string/list_item_open"
+          />
     <item android:id="@+id/list_item_view"
-          android:title="@string/list_item_view" />
+          android:title="@string/list_item_view"
+          />
+    <item android:id="@+id/list_item_copy"
+          android:title="@string/list_item_copy"
+          />
+    <item android:id="@+id/list_item_new_from"
+          android:title="@string/list_item_new_from"
+          />
     <item android:id="@+id/list_item_hide"
-          android:title="@string/list_item_hide" />
+          android:title="@string/list_item_hide"
+          />
     <item android:id="@+id/list_item_delete"
-          android:title="@string/list_item_delete" />
+          android:title="@string/list_item_delete"
+          />
+    <item android:id="@+id/list_item_move_up"
+          android:title="@string/list_item_move_up"
+          />
+    <item android:id="@+id/list_item_move_down"
+          android:title="@string/list_item_move_down"
+          />
+    <item android:id="@+id/list_item_move_to_top"
+          android:title="@string/list_item_move_to_top"
+          />
+    <item android:id="@+id/list_item_move_to_bottom"
+          android:title="@string/list_item_move_to_bottom"
+          />
 </menu>
diff --git a/xwords4/android/XWords4/res/menu/games_list_menu.xml b/xwords4/android/XWords4/res/menu/games_list_menu.xml
index e01b9a173..5b8be1807 100644
--- a/xwords4/android/XWords4/res/menu/games_list_menu.xml
+++ b/xwords4/android/XWords4/res/menu/games_list_menu.xml
@@ -2,5 +2,9 @@
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/gamel_menu_delete_all"
-          android:title="@string/gamel_menu_delete_all" />
+          android:title="@string/gamel_menu_delete_all"
+          />
+    <item android:id="@+id/gamel_menu_view_hidden"
+          android:title="@string/gamel_menu_view_hidden"
+          />
 </menu>
diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml
index 26934b9d0..fcf13cc28 100644
--- a/xwords4/android/XWords4/res/values/strings.xml
+++ b/xwords4/android/XWords4/res/values/strings.xml
@@ -25,6 +25,12 @@
     <string name="list_item_view">View</string>
     <string name="list_item_hide">Hide</string>
     <string name="list_item_delete">Delete</string>
+	<string name="list_item_copy">Copy</string>
+	<string name="list_item_new_from">New from</string>
+	<string name="list_item_move_up">Move up</string>
+	<string name="list_item_move_down">Move down</string>
+	<string name="list_item_move_to_top">Move to top</string>
+	<string name="list_item_move_to_bottom">Move to bottom</string>
 
     <string name="resolve_edit">Edit note</string>
     <string name="resolve_title">Edit title</string>  
@@ -63,6 +69,7 @@
 	<string name="board_submenu_hint">Hint</string>
 	<string name="board_menu_hint_next">Next hint</string>
 	<string name="board_menu_hint">Hint</string>
+	<string name="board_menu_values">Show values</string>
 	<string name="board_submenu_game">Game</string>
 	<string name="board_menu_game_counts">Counts and values</string>
 	<string name="board_menu_game_left">Tiles remaining</string>
@@ -76,4 +83,6 @@
 	<string name="board_menu_file_about">About Crosswords</string>
 
 	<string name="gamel_menu_delete_all">Delete all</string>
+	<string name="gamel_menu_view_hidden">Hidden games</string>
+
 </resources>