1 files changed, 35 insertions, 7 deletions

diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c
index 4f2c8b1bbe..754af24f8c 100644
--- a/apps/plugins/starfield.c
+++ b/apps/plugins/starfield.c
@@ -88,28 +88,56 @@ static struct plugin_api* rb; /* global api struct pointer */
 #define STARFIELD_TOGGLE_COLOR BUTTON_RC_MODE
 #elif (CONFIG_KEYPAD == COWOND2_PAD)
 #define STARFIELD_QUIT BUTTON_POWER
-#define STARFIELD_INCREASE_ZMOVE BUTTON_UP
-#define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN
-#define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT
-#define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT
-#define STARFIELD_TOGGLE_COLOR BUTTON_MENU
+#endif
 
-#else
+#ifdef HAVE_TOUCHPAD
+#ifndef STARFIELD_QUIT
+#define STARFIELD_QUIT              BUTTON_TOPLEFT
+#endif
+#ifndef STARFIELD_INCREASE_ZMOVE
+#define STARFIELD_INCREASE_ZMOVE    BUTTON_TOPMIDDLE
+#endif
+#ifndef STARFIELD_DECREASE_ZMOVE
+#define STARFIELD_DECREASE_ZMOVE    BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef STARFIELD_INCREASE_NB_STARS
+#define STARFIELD_INCREASE_NB_STARS BUTTON_MIDRIGHT
+#endif
+#ifndef STARFIELD_DECREASE_NB_STARS
+#define STARFIELD_DECREASE_NB_STARS BUTTON_MIDLEFT
+#endif
+#ifndef STARFIELD_TOGGLE_COLOR
+#define STARFIELD_TOGGLE_COLOR      BUTTON_CENTER
+#endif
+#endif
+
+#ifndef STARFIELD_QUIT
 #define STARFIELD_QUIT BUTTON_OFF
+#endif
+#ifndef STARFIELD_INCREASE_ZMOVE
 #define STARFIELD_INCREASE_ZMOVE BUTTON_UP
+#endif
+#ifndef STARFIELD_DECREASE_ZMOVE
 #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN
+#endif
+#ifndef STARFIELD_INCREASE_NB_STARS
 #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT
+#endif
+#ifndef STARFIELD_DECREASE_NB_STARS
 #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT
+#endif
+
+#ifndef STARFIELD_TOGGLE_COLOR
 #ifdef BUTTON_SELECT
 #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT
 #else
 #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY
 #endif
+#endif
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define STARFIELD_RC_QUIT BUTTON_RC_STOP
 #endif
 
-#endif
 
 #define LCD_CENTER_X (LCD_WIDTH/2)
 #define LCD_CENTER_Y (LCD_HEIGHT/2)