1 files changed, 31 insertions, 12 deletions

diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index f93ea62114..ddd659d2a1 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -149,17 +149,33 @@ PLUGIN_HEADER
 #define JEWELS_RC_CANCEL BUTTON_REC
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
-#define JEWELS_UP     BUTTON_UP
-#define JEWELS_DOWN   BUTTON_DOWN
-#define JEWELS_LEFT   BUTTON_LEFT
-#define JEWELS_RIGHT  BUTTON_RIGHT
-#define JEWELS_SELECT BUTTON_SELECT
 #define JEWELS_CANCEL BUTTON_POWER
 
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef JEWELS_UP
+#define JEWELS_UP     BUTTON_TOPMIDDLE
+#endif
+#ifndef JEWELS_DOWN
+#define JEWELS_DOWN   BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef JEWELS_LEFT
+#define JEWELS_LEFT   BUTTON_MIDLEFT
+#endif
+#ifndef JEWELS_RIGHT
+#define JEWELS_RIGHT  BUTTON_MIDRIGHT
+#endif
+#ifndef JEWELS_SELECT
+#define JEWELS_SELECT BUTTON_CENTER
+#endif
+#ifndef JEWELS_CANCEL
+#define JEWELS_CANCEL BUTTON_TOPLEFT
+#endif
+#endif
+
 /* use 30x30 tiles (iPod Video, Gigabeat) */
 #if (LCD_HEIGHT == 240) && (LCD_WIDTH == 320) || \
       ((LCD_HEIGHT == 320) && (LCD_WIDTH == 240))
@@ -1574,6 +1590,8 @@ static int jewels_main(struct game_context* bj) {
                 rb->lcd_puts(0, 11, "Long PLAY for menu");
                 rb->lcd_puts(0, 12, "REC to cancel");
 #elif CONFIG_KEYPAD == COWOND2_PAD
+                rb->lcd_puts(0, 11, "POWER to cancel");
+#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
                 rb->lcd_puts(0, 2, "Swap pairs of jewels to");
                 rb->lcd_puts(0, 3, "form connected segments");
                 rb->lcd_puts(0, 4, "of three or more of the");
@@ -1582,19 +1600,20 @@ static int jewels_main(struct game_context* bj) {
                 rb->lcd_puts(0, 8, "Directions to move");
                 rb->lcd_puts(0, 9, "SELECT to select");
                 rb->lcd_puts(0, 10, "Long SELECT to show menu");
-                rb->lcd_puts(0, 11, "POWER to cancel");
-#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
+                rb->lcd_puts(0, 11, "BACK to cancel");
+#else
+    #warning: missing help text.
+#endif
+
+#ifdef HAVE_TOUCHPAD
                 rb->lcd_puts(0, 2, "Swap pairs of jewels to");
                 rb->lcd_puts(0, 3, "form connected segments");
                 rb->lcd_puts(0, 4, "of three or more of the");
                 rb->lcd_puts(0, 5, "same type.");
                 rb->lcd_puts(0, 7, "Controls:");
                 rb->lcd_puts(0, 8, "Directions to move");
-                rb->lcd_puts(0, 9, "SELECT to select");
-                rb->lcd_puts(0, 10, "Long SELECT to show menu");
-                rb->lcd_puts(0, 11, "BACK to cancel");
-#else
-    #warning: missing help text.
+                rb->lcd_puts(0, 9, "CENTER to select");
+                rb->lcd_puts(0, 10, "Long CENTER to show menu");
 #endif
                 rb->lcd_update();
                 while(true) {