Jewels: accept FS#9947 changing 'Resume Game' in the game menu to 'Resume Saved Game' to be less confusing. Bring up the in-game menu using the regular menu button on h100/h300/gigabeat S. Add keymap to the manual for gigabeat S

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20561 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 14 insertions, 10 deletions

diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 00839af48d..9fa9a2e413 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -59,6 +59,7 @@ PLUGIN_HEADER
 #define JEWELS_LEFT   BUTTON_LEFT
 #define JEWELS_RIGHT  BUTTON_RIGHT
 #define JEWELS_SELECT BUTTON_SELECT
+#define JEWELS_MENU   BUTTON_MODE
 #define JEWELS_CANCEL BUTTON_OFF
 #define JEWELS_RC_CANCEL BUTTON_RC_STOP
 
@@ -133,6 +134,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD
 #define JEWELS_LEFT   BUTTON_LEFT
 #define JEWELS_RIGHT  BUTTON_RIGHT
 #define JEWELS_SELECT BUTTON_SELECT
+#define JEWELS_MENU   BUTTON_MENU
 #define JEWELS_CANCEL BUTTON_BACK
 
 #elif CONFIG_KEYPAD == MROBE100_PAD
@@ -355,7 +357,7 @@ struct jewels_menu {
     {"Jewels", false, 0, 6,
         {{"New Game",    MRES_NEW},
          {"Puzzle",      MRES_PUZZLE},
-         {"Resume Game", MRES_RESUME},
+         {"Resume Saved Game", MRES_RESUME},
          {"High Scores", MRES_SCORES},
          {"Help",        MRES_HELP},
          {"Quit",        MRES_QUIT}}},
@@ -1904,6 +1906,9 @@ static int jewels_main(struct game_context* bj) {
                 }
                 break;
 
+#ifdef JEWELS_MENU
+            case JEWELS_MENU:
+#endif
             case (JEWELS_SELECT|BUTTON_REPEAT): /* show menu */
                 if(!inmenu) inmenu = true;
                 break;
diff --git a/manual/plugins/jewels.tex b/manual/plugins/jewels.tex
index 36ab6eb494..bd9aa6addf 100644
--- a/manual/plugins/jewels.tex
+++ b/manual/plugins/jewels.tex
@@ -13,27 +13,26 @@ after every one hundred points and randomly clears several jewels.
 \begin{table}
   \begin{btnmap}{}{}
     \ButtonLeft/\ButtonRight/\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
         {\ButtonUp/\ButtonDown}
     \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu/\ButtonPlay}
     \opt{IRIVER_H10_PAD}{\ButtonScrollUp/\ButtonScrollDown}
     & Move the cursor around the jewels \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{\ButtonPlay}
     \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD,GIGABEAT_S_PAD}
         {\ButtonSelect}
     & Select a jewel \\
     \opt{RECORDER_PAD,IRIVER_H10_PAD}{Long \ButtonPlay}%
     \opt{ONDIO_PAD}{Long \ButtonMenu}%
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}%
+    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode{} or Long \ButtonSelect}
+    \opt{GIGABEAT_S_PAD}{\ButtonMenu{} or Long \ButtonSelect}
+    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}%
         {Long \ButtonSelect}%
-  \nopt{IPOD_4G_PAD,IPOD_3G_PAD}{% start here because latex didn't like skipping the bottom row
     & Show the in-game menu \\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}%
-    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower}%
-    & Exit \\}%
-  \opt{IPOD_4G_PAD,IPOD_3G_PAD}{% only finish this row for Ipods here
-    & Show the in-game menu \\}%
+    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff & Exit \\}%
+    \opt{IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,IAUDIO_X5_PAD}{\ButtonPower & Exit \\}%
+    
   \end{btnmap}
 \end{table}