From 1bed9e3bec0c8945830710775286548a4d05f3e0 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 7 Apr 2014 07:59:55 -0700
Subject: [PATCH] move menu xml files outside build tree: scripts will generate
 now

---
 .../XWords4/res/menu-small/board_menu.xml     | 104 ----------------
 .../android/XWords4/res/menu/board_menu.xml   |  81 -------------
 .../android/XWords4/res/menu/chat_menu.xml    |   7 --
 .../android/XWords4/res/menu/dicts_menu.xml   |  25 ----
 .../XWords4/res/menu/games_list_menu.xml      | 114 ------------------
 xwords4/android/XWords4/res/menu/loc_menu.xml |   5 -
 .../android/XWords4/res/menu/studylist.xml    |  32 -----
 7 files changed, 368 deletions(-)
 delete mode 100644 xwords4/android/XWords4/res/menu-small/board_menu.xml
 delete mode 100644 xwords4/android/XWords4/res/menu/board_menu.xml
 delete mode 100644 xwords4/android/XWords4/res/menu/chat_menu.xml
 delete mode 100644 xwords4/android/XWords4/res/menu/dicts_menu.xml
 delete mode 100644 xwords4/android/XWords4/res/menu/games_list_menu.xml
 delete mode 100644 xwords4/android/XWords4/res/menu/loc_menu.xml
 delete mode 100644 xwords4/android/XWords4/res/menu/studylist.xml

diff --git a/xwords4/android/XWords4/res/menu-small/board_menu.xml b/xwords4/android/XWords4/res/menu-small/board_menu.xml
deleted file mode 100644
index fe5c90f2f..000000000
--- a/xwords4/android/XWords4/res/menu-small/board_menu.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <item android:id="@+id/board_menu_invite"
-        android:title="@string/board_menu_invite"
-        />
-
-  <group android:id="@+id/group_done">
-    <!-- title set in BoardActivity -->
-    <item android:id="@+id/board_menu_done"
-          android:alphabeticShortcut="D"
-          />
-    <item android:id="@+id/board_menu_trade"
-          android:title="@string/board_menu_trade"
-          android:alphabeticShortcut="T"
-          />
-  </group>
-
-  <group android:id="@+id/group_exchange">
-    <item android:id="@+id/board_menu_trade_commit"
-          android:title="@string/button_trade_commit"
-          />
-    <item android:id="@+id/board_menu_trade_cancel"
-          android:title="@string/button_trade_cancel"
-          />
-  </group>
-
-  <group android:id="@+id/group_hint">
-    <item android:id="@+id/board_menu_hint_prev"
-          android:title="@string/menu_hint_prev"
-          />
-    <item android:id="@+id/board_menu_hint_next"
-          android:title="@string/menu_hint_next"
-          />
-  </group>
-
-  <item android:id="@+id/board_menu_undo_current"
-        android:title="@string/board_menu_undo_current"
-        />
-
-  <item android:id="@+id/board_menu_tray"/>
-
-  <item android:id="@+id/board_menu_dict"
-        android:title="@string/board_menu_dict"
-        />
-
-  <item android:id="@+id/board_menu_juggle"
-        android:title="@string/menu_juggle"
-        />
-  <item android:id="@+id/board_menu_flip"
-        android:title="@string/menu_flip"
-        />
-
-  <item android:id="@+id/board_menu_undo_last"
-        android:title="@string/board_menu_undo_last"
-        />
-
-  <item android:id="@+id/board_menu_zoom"
-        android:title="@string/menu_zoom"
-        />
-  <item android:id="@+id/board_menu_chat"
-        android:title="@string/menu_chat"
-        />
-  <item android:id="@+id/board_menu_toggle"
-        android:title="@string/menu_toggle_values"
-        />
-
-  <item android:title="@string/board_submenu_game">
-    <menu>
-      <item android:id="@+id/board_menu_game_counts"
-            android:title="@string/board_menu_game_counts" />
-      <item android:id="@+id/board_menu_game_left"
-            android:title="@string/board_menu_game_left" />
-      <item android:id="@+id/board_menu_game_history"
-            android:title="@string/board_menu_game_history" />
-      <item android:id="@+id/board_menu_game_resign"
-            android:title="@string/board_menu_game_final" />
-      <item android:id="@+id/board_menu_game_resend"
-            android:title="@string/board_menu_game_resend" />
-    </menu>
-  </item>
-
-    <item android:id="@+id/games_menu_study"
-          android:title="@string/gamel_menu_study"
-          />
-
-    <item android:id="@+id/gamel_menu_checkmoves"
-          android:title="@string/gamel_menu_checkmoves"
-          />
-
-    <item android:id="@+id/board_menu_file_prefs"
-          android:title="@string/menu_prefs"
-          android:alphabeticShortcut="P"
-          />
-    <item android:id="@+id/board_menu_file_about"
-          android:title="@string/board_menu_file_about"
-          android:alphabeticShortcut="A"
-          />
-
-    <item android:id="@+id/board_menu_game_netstats"
-          android:title="@string/board_menu_game_netstats" />
-
-</menu>
diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/XWords4/res/menu/board_menu.xml
deleted file mode 100644
index a232a8d85..000000000
--- a/xwords4/android/XWords4/res/menu/board_menu.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <group android:id="@+id/group_done">
-    <!-- title set in BoardActivity -->
-    <item android:id="@+id/board_menu_invite"
-          android:title="@string/board_menu_invite"
-          android:showAsAction="ifRoom"
-          android:icon="@drawable/send__gen"
-          />
-
-    <item android:id="@+id/board_menu_done"
-          android:alphabeticShortcut="D"
-          android:showAsAction="ifRoom"
-          android:icon="@drawable/save__gen"
-          />
-
-    <item android:id="@+id/board_menu_trade"
-          android:title="@string/board_menu_trade"
-          android:alphabeticShortcut="T"
-          android:showAsAction="ifRoom"
-          />
-  </group>
-
-    <item android:id="@+id/board_menu_trade_cancel"
-          android:title="@string/button_trade_cancel"
-          android:showAsAction="ifRoom"
-          android:icon="@drawable/back__gen"
-          />
-
-    <item android:id="@+id/board_menu_trade_commit"
-          android:title="@string/button_trade_commit"
-          android:showAsAction="ifRoom"
-          android:icon="@drawable/save__gen"
-          />
-
-    <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"
-          />
-
-    <item android:title="@string/board_submenu_game">
-      <menu>
-        <item android:id="@+id/board_menu_game_counts"
-              android:title="@string/board_menu_game_counts" />
-        <item android:id="@+id/board_menu_game_left"
-              android:title="@string/board_menu_game_left" />
-        <item android:id="@+id/board_menu_game_history"
-              android:title="@string/board_menu_game_history" />
-        <item android:id="@+id/board_menu_game_resign"
-              android:title="@string/board_menu_game_resign" />
-        <item android:id="@+id/board_menu_game_resend"
-              android:title="@string/board_menu_game_resend" />
-      </menu>
-    </item>
-    
-    <item android:id="@+id/games_menu_study"
-          android:title="@string/gamel_menu_study"
-          />
-
-    <item android:id="@+id/gamel_menu_checkmoves"
-          android:title="@string/gamel_menu_checkmoves"
-          />
-
-    <item android:id="@+id/board_menu_file_prefs"
-          android:title="@string/menu_prefs"
-          android:alphabeticShortcut="P"
-          />
-    <item android:id="@+id/board_menu_file_about"
-          android:title="@string/board_menu_file_about"
-          android:alphabeticShortcut="A"
-          />
-
-    <item android:id="@+id/board_menu_game_netstats"
-          android:title="@string/board_menu_game_netstats" />
-
-</menu>
diff --git a/xwords4/android/XWords4/res/menu/chat_menu.xml b/xwords4/android/XWords4/res/menu/chat_menu.xml
deleted file mode 100644
index 9ce17dcd1..000000000
--- a/xwords4/android/XWords4/res/menu/chat_menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/chat_menu_clear"
-          android:title="@string/chat_menu_clear"
-          />
-</menu>
diff --git a/xwords4/android/XWords4/res/menu/dicts_menu.xml b/xwords4/android/XWords4/res/menu/dicts_menu.xml
deleted file mode 100644
index 6126c17fa..000000000
--- a/xwords4/android/XWords4/res/menu/dicts_menu.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@+id/dicts_download"
-          android:title="@string/download_dicts"
-          android:icon="@drawable/download__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/dicts_delete"
-          android:title="@string/list_item_delete"
-          android:icon="@drawable/content_discard__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/dicts_move"
-          android:title="@string/dicts_item_move"
-          />
-
-    <item android:id="@+id/dicts_select"
-          android:title="@string/dicts_item_select"
-          />
-
-</menu>
diff --git a/xwords4/android/XWords4/res/menu/games_list_menu.xml b/xwords4/android/XWords4/res/menu/games_list_menu.xml
deleted file mode 100644
index 04c8450bc..000000000
--- a/xwords4/android/XWords4/res/menu/games_list_menu.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/games_menu_newgame"
-          android:title="@string/button_new_game"
-          android:icon="@drawable/content_new__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_menu_newgroup"
-          android:title="@string/button_new_group"
-          android:icon="@drawable/new_group__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_menu_prefs"
-          android:title="@string/menu_prefs"
-          android:icon="@drawable/prefs__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/games_menu_rateme"
-          android:title="@string/menu_rateme"
-          />
-
-    <item android:id="@+id/games_menu_dicts"
-          android:title="@string/gamel_menu_dicts"
-          android:icon="@drawable/dict__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_menu_study"
-          android:title="@string/gamel_menu_study"
-          />
-    <item android:id="@+id/games_menu_email"
-          android:title="@string/board_menu_file_email"
-          android:icon="@drawable/email__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_menu_about"
-          android:title="@string/board_menu_file_about"
-          android:icon="@android:drawable/ic_menu_info_details"
-          />
-    <item android:id="@+id/games_menu_resend"
-          android:title="@string/board_menu_game_resend"
-          />
-    <item android:id="@+id/games_menu_checkmoves"
-          android:title="@string/gamel_menu_checkmoves"
-          android:icon="@drawable/stat_notify_sync"
-          />
-
-    <!-- Game items -->
-    <item android:id="@+id/games_game_delete"
-          android:title="@string/list_item_delete"
-          android:icon="@drawable/content_discard__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_game_config"
-          android:title="@string/list_item_config"
-          android:icon="@drawable/content_edit"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_game_move"
-          android:title="@string/list_item_move"
-          android:icon="@drawable/relabel__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_game_reset"
-          android:title="@string/list_item_reset"
-          android:icon="@drawable/reset__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_game_new_from"
-          android:title="@string/list_item_new_from"
-          />
-    <item android:id="@+id/games_game_rename"
-          android:title="@string/list_item_rename"
-          />
-    <item android:id="@+id/games_game_copy"
-          android:title="@string/list_item_copy"
-          />
-
-    <!-- Group items -->
-    <item android:id="@+id/games_group_moveup"
-          android:title="@string/list_group_moveup"
-          android:icon="@drawable/up__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_group_movedown"
-          android:title="@string/list_group_movedown"
-          android:icon="@drawable/down__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_group_delete"
-          android:title="@string/list_group_delete"
-          android:icon="@drawable/content_discard__gen"
-          android:showAsAction="ifRoom"
-          />
-    <item android:id="@+id/games_group_default"
-          android:title="@string/list_group_default"
-          />
-    <item android:id="@+id/games_group_rename"
-          android:title="@string/list_group_rename"
-          />
-
-    <!-- Debug only menuitems -->
-    <item android:id="@+id/games_menu_checkupdates"
-          android:title="@string/gamel_menu_checkupdates"
-          />
-    <item android:id="@+id/games_menu_storedb"
-          android:title="@string/gamel_menu_storedb"
-          />
-    <item android:id="@+id/games_menu_loaddb"
-          android:title="@string/gamel_menu_loaddb"
-          />
-
-</menu>
diff --git a/xwords4/android/XWords4/res/menu/loc_menu.xml b/xwords4/android/XWords4/res/menu/loc_menu.xml
deleted file mode 100644
index 3459936f5..000000000
--- a/xwords4/android/XWords4/res/menu/loc_menu.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <!-- Nothing goes here - though Translate may get added -->
-</menu>
diff --git a/xwords4/android/XWords4/res/menu/studylist.xml b/xwords4/android/XWords4/res/menu/studylist.xml
deleted file mode 100644
index 9f09dfdb0..000000000
--- a/xwords4/android/XWords4/res/menu/studylist.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/slmenu_lookup_sel"
-          android:icon="@drawable/search__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/slmenu_select_all"
-          android:title="@string/slmenu_select_all"
-          android:icon="@drawable/select_all__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/slmenu_deselect_all"
-          android:title="@string/slmenu_deselect_all"
-          android:icon="@drawable/clear_all__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/slmenu_copy_sel"
-          android:title="@string/slmenu_copy_sel"
-          android:icon="@drawable/content_copy__gen"
-          android:showAsAction="ifRoom"
-          />
-
-    <item android:id="@+id/slmenu_clear_sel"
-          android:title="@string/slmenu_clear_sel"
-          android:icon="@drawable/content_discard__gen"
-          android:showAsAction="ifRoom"
-          />
-</menu>