3 files changed, 26 insertions, 29 deletions
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index 863f9b246b..e20acf93ce 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -89,14 +89,15 @@
 #elif CONFIG_KEYPAD == SANSA_E200_PAD
-#define PACMAN_UP      BUTTON_UP
+#define PACMAN_UP       BUTTON_RIGHT
-#define PACMAN_DOWN    BUTTON_DOWN
+#define PACMAN_DOWN     BUTTON_LEFT
-#define PACMAN_LEFT    BUTTON_LEFT
+#define PACMAN_LEFT     BUTTON_UP
-#define PACMAN_RIGHT   BUTTON_RIGHT
+#define PACMAN_RIGHT    BUTTON_DOWN
-#define PACMAN_1UP     BUTTON_SELECT
+#define PACMAN_1UP      BUTTON_SELECT
-#define PACMAN_2UP     BUTTON_POWER
+#define PACMAN_2UP      BUTTON_REC
-#define PACMAN_COIN    BUTTON_REC
+#define PACMAN_COIN_PRE BUTTON_SELECT
-#define PACMAN_MENU    (BUTTON_SELECT|BUTTON_REPEAT)
+#define PACMAN_COIN     (BUTTON_SELECT | BUTTON_DOWN)
+#define PACMAN_MENU     BUTTON_POWER
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index 7acd92b775..45e18834f3 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -179,22 +179,19 @@ static struct plugin_api* rb;
 #   define SOL_QUIT          BUTTON_POWER
 #   define SOL_UP            BUTTON_UP
 #   define SOL_DOWN          BUTTON_DOWN
-#   define SOL_LEFT          BUTTON_LEFT
+#   define SOL_LEFT          BUTTON_SCROLL_UP
-#   define SOL_RIGHT         BUTTON_RIGHT
+#   define SOL_RIGHT         BUTTON_SCROLL_DOWN
-#   define SOL_MOVE_PRE      BUTTON_SELECT
+#   define SOL_MOVE          BUTTON_SELECT
-#   define SOL_MOVE          (BUTTON_SELECT | BUTTON_UP)
+#   define SOL_DRAW          BUTTON_REC
-#   define SOL_DRAW_PRE      BUTTON_UP
+#   define SOL_REM2CUR       BUTTON_LEFT
-#   define SOL_DRAW          (BUTTON_UP | BUTTON_LEFT)
+#   define SOL_CUR2STACK_PRE BUTTON_REC
-#   define SOL_REM2CUR_PRE   BUTTON_UP
+#   define SOL_CUR2STACK     (BUTTON_REC | BUTTON_RIGHT)
-#   define SOL_REM2CUR       (BUTTON_UP | BUTTON_RIGHT)
+#   define SOL_REM2STACK     BUTTON_RIGHT
-#   define SOL_CUR2STACK_PRE BUTTON_SELECT
-#   define SOL_CUR2STACK     (BUTTON_SELECT | BUTTON_RIGHT)
-#   define SOL_REM2STACK     BUTTON_REC
 #   define HK_MOVE           "SELECT"
-#   define HK_DRAW           "PLAY"
+#   define HK_DRAW           "REC"
-#   define HK_REM2CUR        "PLAY.."
+#   define HK_REM2CUR        "LEFT"
-#   define HK_CUR2STACK      "SELECT.."
+#   define HK_CUR2STACK      "DOUBLE SELECT"
-#   define HK_REM2STACK      "REC"
+#   define HK_REM2STACK      "RIGHT"
 #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
 #   define SOL_QUIT          BUTTON_POWER
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 2f5814d8c8..60debc5000 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -140,12 +140,11 @@ PLUGIN_HEADER
 #define STAR_QUIT BUTTON_POWER
 #define STAR_UP   BUTTON_UP
 #define STAR_DOWN BUTTON_DOWN
-#define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT
+#define STAR_TOGGLE_CONTROL BUTTON_SELECT
-#define STAR_TOGGLE_CONTROL (BUTTON_SELECT | BUTTON_REL)
+#define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT)
-#define STAR_LEVEL_UP BUTTON_SCROLL_UP
+#define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT)
-#define STAR_LEVEL_DOWN BUTTON_SCROLL_DOWN
+#define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN)
-#define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_RIGHT)
+#define STAR_MENU_RUN BUTTON_SELECT
-#define STAR_MENU_RUN BUTTON_REC
 #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)

diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 863f9b246b..e20acf93ce 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h
@@ -89,14 +89,15 @@
89		89
90	#elif CONFIG_KEYPAD == SANSA_E200_PAD	90	#elif CONFIG_KEYPAD == SANSA_E200_PAD
91		91
92	#define PACMAN_UP BUTTON_UP	92	#define PACMAN_UP BUTTON_RIGHT
93	#define PACMAN_DOWN BUTTON_DOWN	93	#define PACMAN_DOWN BUTTON_LEFT
94	#define PACMAN_LEFT BUTTON_LEFT	94	#define PACMAN_LEFT BUTTON_UP
95	#define PACMAN_RIGHT BUTTON_RIGHT	95	#define PACMAN_RIGHT BUTTON_DOWN
96	#define PACMAN_1UP BUTTON_SELECT	96	#define PACMAN_1UP BUTTON_SELECT
97	#define PACMAN_2UP BUTTON_POWER	97	#define PACMAN_2UP BUTTON_REC
98	#define PACMAN_COIN BUTTON_REC	98	#define PACMAN_COIN_PRE BUTTON_SELECT
99	#define PACMAN_MENU (BUTTON_SELECT\|BUTTON_REPEAT)	99	#define PACMAN_COIN (BUTTON_SELECT \| BUTTON_DOWN)
		100	#define PACMAN_MENU BUTTON_POWER
100		101
101	#elif CONFIG_KEYPAD == IRIVER_H10_PAD	102	#elif CONFIG_KEYPAD == IRIVER_H10_PAD
102		103


diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 7acd92b775..45e18834f3 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c
@@ -179,22 +179,19 @@ static struct plugin_api* rb;
179	# define SOL_QUIT BUTTON_POWER	179	# define SOL_QUIT BUTTON_POWER
180	# define SOL_UP BUTTON_UP	180	# define SOL_UP BUTTON_UP
181	# define SOL_DOWN BUTTON_DOWN	181	# define SOL_DOWN BUTTON_DOWN
182	# define SOL_LEFT BUTTON_LEFT	182	# define SOL_LEFT BUTTON_SCROLL_UP
183	# define SOL_RIGHT BUTTON_RIGHT	183	# define SOL_RIGHT BUTTON_SCROLL_DOWN
184	# define SOL_MOVE_PRE BUTTON_SELECT	184	# define SOL_MOVE BUTTON_SELECT
185	# define SOL_MOVE (BUTTON_SELECT \| BUTTON_UP)	185	# define SOL_DRAW BUTTON_REC
186	# define SOL_DRAW_PRE BUTTON_UP	186	# define SOL_REM2CUR BUTTON_LEFT
187	# define SOL_DRAW (BUTTON_UP \| BUTTON_LEFT)	187	# define SOL_CUR2STACK_PRE BUTTON_REC
188	# define SOL_REM2CUR_PRE BUTTON_UP	188	# define SOL_CUR2STACK (BUTTON_REC \| BUTTON_RIGHT)
189	# define SOL_REM2CUR (BUTTON_UP \| BUTTON_RIGHT)	189	# define SOL_REM2STACK BUTTON_RIGHT
190	# define SOL_CUR2STACK_PRE BUTTON_SELECT
191	# define SOL_CUR2STACK (BUTTON_SELECT \| BUTTON_RIGHT)
192	# define SOL_REM2STACK BUTTON_REC
193	# define HK_MOVE "SELECT"	190	# define HK_MOVE "SELECT"
194	# define HK_DRAW "PLAY"	191	# define HK_DRAW "REC"
195	# define HK_REM2CUR "PLAY.."	192	# define HK_REM2CUR "LEFT"
196	# define HK_CUR2STACK "SELECT.."	193	# define HK_CUR2STACK "DOUBLE SELECT"
197	# define HK_REM2STACK "REC"	194	# define HK_REM2STACK "RIGHT"
198		195
199	#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)	196	#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
200	# define SOL_QUIT BUTTON_POWER	197	# define SOL_QUIT BUTTON_POWER


diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 2f5814d8c8..60debc5000 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c
@@ -140,12 +140,11 @@ PLUGIN_HEADER
140	#define STAR_QUIT BUTTON_POWER	140	#define STAR_QUIT BUTTON_POWER
141	#define STAR_UP BUTTON_UP	141	#define STAR_UP BUTTON_UP
142	#define STAR_DOWN BUTTON_DOWN	142	#define STAR_DOWN BUTTON_DOWN
143	#define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT	143	#define STAR_TOGGLE_CONTROL BUTTON_SELECT
144	#define STAR_TOGGLE_CONTROL (BUTTON_SELECT \| BUTTON_REL)	144	#define STAR_LEVEL_UP (BUTTON_SELECT \| BUTTON_RIGHT)
145	#define STAR_LEVEL_UP BUTTON_SCROLL_UP	145	#define STAR_LEVEL_DOWN (BUTTON_SELECT \| BUTTON_LEFT)
146	#define STAR_LEVEL_DOWN BUTTON_SCROLL_DOWN	146	#define STAR_LEVEL_REPEAT (BUTTON_SELECT \| BUTTON_DOWN)
147	#define STAR_LEVEL_REPEAT (BUTTON_SELECT \| BUTTON_RIGHT)	147	#define STAR_MENU_RUN BUTTON_SELECT
148	#define STAR_MENU_RUN BUTTON_REC
149		148
150		149
151	#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)	150	#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)