From a7168feeac24ff192e1174717dbfa5582509babf Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Sat, 19 May 2007 23:38:09 +0000 Subject: attempt to make the Gigabeat button mappings in the plugins more logical and in line with the mapping in rockbox itself git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13436 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bounce.c | 4 ++-- apps/plugins/brickmania.c | 2 +- apps/plugins/calculator.c | 4 ++-- apps/plugins/chessbox/chessbox.c | 7 ++++--- apps/plugins/chessclock.c | 12 ++++++------ apps/plugins/chip8.c | 8 ++++++-- apps/plugins/cube.c | 11 +++++------ apps/plugins/demystify.c | 2 +- apps/plugins/dice.c | 4 ++-- apps/plugins/dict.c | 2 +- apps/plugins/disktidy.c | 2 +- apps/plugins/fire.c | 2 +- apps/plugins/flipit.c | 20 ++++++++++---------- apps/plugins/invadrox.c | 2 +- apps/plugins/jewels.c | 4 ++-- apps/plugins/jpeg.c | 6 +++--- apps/plugins/logo.c | 2 +- apps/plugins/mandelbrot.c | 14 +++++++------- apps/plugins/mazezam.c | 8 ++++---- apps/plugins/midiplay.c | 4 ++-- apps/plugins/minesweeper.c | 4 ++-- apps/plugins/mosaique.c | 4 ++-- apps/plugins/mp3_encoder.c | 2 +- apps/plugins/mpegplayer/mpegplayer.c | 2 +- apps/plugins/pong.c | 4 ++-- apps/plugins/rockblox.c | 6 +++--- apps/plugins/rockboy/rockboy.c | 2 +- apps/plugins/rockpaint.c | 6 +++--- apps/plugins/sliding_puzzle.c | 4 ++-- apps/plugins/snake.c | 2 +- apps/plugins/snake2.c | 2 +- apps/plugins/snow.c | 2 +- apps/plugins/sokoban.c | 16 ++++++++-------- apps/plugins/solitaire.c | 10 +++++----- apps/plugins/spacerocks.c | 4 ++-- apps/plugins/star.c | 12 ++++++------ apps/plugins/starfield.c | 2 +- apps/plugins/stats.c | 2 +- apps/plugins/stopwatch.c | 4 ++-- apps/plugins/sudoku/sudoku.h | 4 ++-- apps/plugins/vu_meter.c | 4 ++-- apps/plugins/wormlet.c | 4 ++-- apps/plugins/xobox.c | 4 ++-- apps/plugins/zxbox/zxbox_keyb.c | 2 +- 44 files changed, 116 insertions(+), 112 deletions(-) diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index c5c9dad83c..1f890fa8a1 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c @@ -72,8 +72,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define BOUNCE_UP BUTTON_UP #define BOUNCE_DOWN BUTTON_DOWN -#define BOUNCE_QUIT BUTTON_A -#define BOUNCE_MODE BUTTON_POWER +#define BOUNCE_QUIT BUTTON_POWER +#define BOUNCE_MODE BUTTON_A #elif CONFIG_KEYPAD == SANSA_E200_PAD #define BOUNCE_UP BUTTON_SCROLL_UP diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index b434c77e25..2557738984 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c @@ -92,7 +92,7 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define QUIT BUTTON_A +#define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 775210d7f3..04fd4e00eb 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -169,11 +169,11 @@ PLUGIN_HEADER #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN -#define CALCULATOR_QUIT BUTTON_A +#define CALCULATOR_QUIT BUTTON_POWER #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) #define CALCULATOR_CALC BUTTON_SELECT -#define CALCULATOR_CLEAR BUTTON_POWER +#define CALCULATOR_CLEAR BUTTON_A #elif CONFIG_KEYPAD == SANSA_E200_PAD #define CALCULATOR_UP BUTTON_UP diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 1418aab1d6..f2ae95b4f2 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c @@ -126,9 +126,10 @@ PLUGIN_HEADER #define CB_DOWN BUTTON_DOWN #define CB_LEFT BUTTON_LEFT #define CB_RIGHT BUTTON_RIGHT -#define CB_PLAY BUTTON_POWER -#define CB_LEVEL BUTTON_MENU -#define CB_MENU BUTTON_A +#define CB_PLAY BUTTON_A +#define CB_LEVEL BUTTON_VOL_UP +#define CB_RESTART BUTTON_VOL_DOWN +#define CB_MENU BUTTON_MENU #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define CB_SELECT BUTTON_REW diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 086245e75c..f1482df990 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c @@ -109,14 +109,14 @@ PLUGIN_HEADER #define CHC_SETTINGS_CANCEL BUTTON_REC #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define CHC_QUIT BUTTON_A +#define CHC_QUIT BUTTON_POWER #define CHC_STARTSTOP BUTTON_SELECT -#define CHC_RESET BUTTON_POWER +#define CHC_RESET BUTTON_A #define CHC_MENU BUTTON_MENU -#define CHC_SETTINGS_INC BUTTON_RIGHT -#define CHC_SETTINGS_DEC BUTTON_LEFT -#define CHC_SETTINGS_OK BUTTON_MENU -#define CHC_SETTINGS_CANCEL BUTTON_A +#define CHC_SETTINGS_INC BUTTON_UP +#define CHC_SETTINGS_DEC BUTTON_DOWN +#define CHC_SETTINGS_OK BUTTON_SELECT +#define CHC_SETTINGS_CANCEL BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_E200_PAD #define CHC_QUIT BUTTON_POWER diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index c18da43591..c38a5fd0bb 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c @@ -1008,12 +1008,16 @@ STATIC void chip8 (void) #define CHIP8_KEY8 BUTTON_DOWN #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define CHIP8_OFF BUTTON_A +#define CHIP8_OFF BUTTON_POWER +#define CHIP8_KEY1 BUTTON_MENU #define CHIP8_KEY2 BUTTON_UP +#define CHIP8_KEY3 BUTTON_VOL_DOWN #define CHIP8_KEY4 BUTTON_LEFT -#define CHIP8_KEY5 BUTTON_MENU +#define CHIP8_KEY5 BUTTON_SELECT #define CHIP8_KEY6 BUTTON_RIGHT +#define CHIP8_KEY7 BUTTON_VOL_UP #define CHIP8_KEY8 BUTTON_DOWN +#define CHIP8_KEY9 BUTTON_A #elif CONFIG_KEYPAD == SANSA_E200_PAD #define CHIP8_OFF BUTTON_POWER diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index bb9e89e2c1..4088d4e94f 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -135,17 +135,16 @@ PLUGIN_HEADER #define CUBE_HIGHSPEED (BUTTON_REC | BUTTON_REL) #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define CUBE_QUIT BUTTON_A +#define CUBE_QUIT BUTTON_POWER #define CUBE_X_INC BUTTON_LEFT #define CUBE_X_DEC BUTTON_RIGHT #define CUBE_Y_INC BUTTON_UP #define CUBE_Y_DEC BUTTON_DOWN -#define CUBE_Z_INC (BUTTON_POWER | BUTTON_UP) -#define CUBE_Z_DEC (BUTTON_POWER | BUTTON_DOWN) +#define CUBE_Z_INC BUTTON_VOL_UP +#define CUBE_Z_DEC BUTTON_VOL_DOWN #define CUBE_MODE BUTTON_MENU -#define CUBE_PAUSE_PRE BUTTON_SELECT -#define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL) -#define CUBE_HIGHSPEED (BUTTON_POWER | BUTTON_REL) +#define CUBE_PAUSE BUTTON_SELECT +#define CUBE_HIGHSPEED BUTTON_A #elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define CUBE_QUIT BUTTON_POWER diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 1a5dfae412..3fe5966eaa 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c @@ -52,7 +52,7 @@ PLUGIN_HEADER #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP #define DEMYSTIFY_DECREASE_SPEED BUTTON_DOWN #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define DEMYSTIFY_QUIT BUTTON_A +#define DEMYSTIFY_QUIT BUTTON_POWER #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c index 39392f1ac5..1113654230 100644 --- a/apps/plugins/dice.c +++ b/apps/plugins/dice.c @@ -89,8 +89,8 @@ use stop to exit #define DICE_BUTTON_SELECT BUTTON_SELECT #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define DICE_BUTTON_ON BUTTON_POWER -#define DICE_BUTTON_OFF BUTTON_A +#define DICE_BUTTON_ON BUTTON_A +#define DICE_BUTTON_OFF BUTTON_POWER #define DICE_BUTTON_SELECT BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_E200_PAD diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 172b8bb39b..76b265eca2 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c @@ -112,7 +112,7 @@ long reverse (long N) { #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define LP_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define LP_QUIT BUTTON_A +#define LP_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_E200_PAD #define LP_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == IRIVER_H10_PAD diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index ca4fb9b830..da2e76fb56 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c @@ -63,7 +63,7 @@ enum tidy_system #define TIDY_STOP BUTTON_POWER #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define TIDY_STOP BUTTON_A +#define TIDY_STOP BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_E200_PAD #define TIDY_STOP BUTTON_POWER diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 915e9ae1dc..bb921ab91f 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c @@ -88,7 +88,7 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; #define FIRE_DECREASE_MULT BUTTON_DOWN #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define FIRE_QUIT BUTTON_A +#define FIRE_QUIT BUTTON_POWER #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT #define FIRE_INCREASE_MULT BUTTON_UP diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 9bff0b09a3..3d28e0d000 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c @@ -100,11 +100,11 @@ PLUGIN_HEADER #define FLIPIT_UP BUTTON_UP #define FLIPIT_DOWN BUTTON_DOWN -#define FLIPIT_QUIT BUTTON_A -#define FLIPIT_SHUFFLE (BUTTON_POWER | BUTTON_LEFT) -#define FLIPIT_SOLVE (BUTTON_POWER | BUTTON_RIGHT) -#define FLIPIT_STEP_BY_STEP (BUTTON_POWER | BUTTON_UP) -#define FLIPIT_TOGGLE BUTTON_MENU +#define FLIPIT_QUIT BUTTON_POWER +#define FLIPIT_SHUFFLE BUTTON_MENU +#define FLIPIT_SOLVE BUTTON_VOL_UP +#define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN +#define FLIPIT_TOGGLE BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_E200_PAD @@ -510,11 +510,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_putsxy(2, 38, "[PLAY..] solution"); rb->lcd_putsxy(2, 48, "[PLAY] step by step"); #elif CONFIG_KEYPAD == GIGABEAT_PAD - rb->lcd_putsxy(2, 8, "[A] to stop"); - rb->lcd_putsxy(2, 18, "[MENU] toggle"); - rb->lcd_putsxy(2, 28, "[P-LEFT] shuffle"); - rb->lcd_putsxy(2, 38, "[P-RIGHT] solution"); - rb->lcd_putsxy(2, 48, "[P-UP] step by step"); + rb->lcd_putsxy(2, 8, "[POWER] to stop"); + rb->lcd_putsxy(2, 18, "[SELECT] toggle"); + rb->lcd_putsxy(2, 28, "[MENU] shuffle"); + rb->lcd_putsxy(2, 38, "[VOL+] solution"); + rb->lcd_putsxy(2, 48, "[VOL-] step by step"); #elif CONFIG_KEYPAD == IRIVER_H10_PAD rb->lcd_putsxy(2, 8, "[POWER] to stop"); rb->lcd_putsxy(2, 18, "[REW] toggle"); diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 5172edbb5e..a99543c069 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c @@ -85,7 +85,7 @@ PLUGIN_HEADER #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define QUIT BUTTON_A +#define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define FIRE BUTTON_SELECT diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 975f0cfa34..c6efcbccef 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c @@ -92,7 +92,7 @@ PLUGIN_HEADER #define JEWELS_LEFT BUTTON_LEFT #define JEWELS_RIGHT BUTTON_RIGHT #define JEWELS_SELECT BUTTON_SELECT -#define JEWELS_CANCEL BUTTON_A +#define JEWELS_CANCEL BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_E200_PAD #define JEWELS_UP BUTTON_UP @@ -1306,7 +1306,7 @@ 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, "A to cancel"); + rb->lcd_puts(0, 11, "POWER to cancel"); #elif CONFIG_KEYPAD == SANSA_E200_PAD rb->lcd_puts(0, 2, "Swap pairs of jewels to"); rb->lcd_puts(0, 3, "form connected segments"); diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 55eade1228..255b82faae 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -121,9 +121,9 @@ PLUGIN_HEADER #define JPEG_DOWN BUTTON_DOWN #define JPEG_LEFT BUTTON_LEFT #define JPEG_RIGHT BUTTON_RIGHT -#define JPEG_MENU BUTTON_A -#define JPEG_NEXT (BUTTON_POWER | BUTTON_RIGHT) -#define JPEG_PREVIOUS (BUTTON_POWER | BUTTON_LEFT) +#define JPEG_MENU BUTTON_MENU +#define JPEG_NEXT (BUTTON_A | BUTTON_RIGHT) +#define JPEG_PREVIOUS (BUTTON_A | BUTTON_LEFT) #elif CONFIG_KEYPAD == SANSA_E200_PAD #define JPEG_ZOOM_PRE BUTTON_SELECT diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 408588e6c1..f030e13a51 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -203,7 +203,7 @@ const unsigned char rockbox16x7[] = { #define LP_DEC_Y BUTTON_DOWN #define LP_INC_Y BUTTON_UP #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define LP_QUIT BUTTON_A +#define LP_QUIT BUTTON_POWER #define LP_DEC_X BUTTON_LEFT #define LP_INC_X BUTTON_RIGHT #define LP_DEC_Y BUTTON_DOWN diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 2c538fb37a..fe920cebd4 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c @@ -107,17 +107,17 @@ PLUGIN_HEADER #define MANDELBROT_RESET BUTTON_REC #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define MANDELBROT_QUIT BUTTON_A +#define MANDELBROT_QUIT BUTTON_POWER #define MANDELBROT_UP BUTTON_UP #define MANDELBROT_DOWN BUTTON_DOWN #define MANDELBROT_LEFT BUTTON_LEFT #define MANDELBROT_RIGHT BUTTON_RIGHT -#define MANDELBROT_ZOOM_IN_PRE BUTTON_MENU -#define MANDELBROT_ZOOM_IN (BUTTON_MENU | BUTTON_REL) -#define MANDELBROT_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) -#define MANDELBROT_MAXITER_INC (BUTTON_POWER | BUTTON_RIGHT) -#define MANDELBROT_MAXITER_DEC (BUTTON_POWER | BUTTON_LEFT) -#define MANDELBROT_RESET BUTTON_SELECT +#define MANDELBROT_ZOOM_IN_PRE BUTTON_SELECT +#define MANDELBROT_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) +#define MANDELBROT_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) +#define MANDELBROT_MAXITER_INC BUTTON_VOL_UP +#define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN +#define MANDELBROT_RESET BUTTON_A #elif CONFIG_KEYPAD == SANSA_E200_PAD #define MANDELBROT_QUIT BUTTON_POWER diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index bd76245662..607348e91c 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c @@ -107,10 +107,10 @@ static struct plugin_api* rb; #define MAZEZAM_RIGHT BUTTON_RIGHT #define MAZEZAM_SELECT BUTTON_SELECT -#define MAZEZAM_RETRY BUTTON_MENU -#define MAZEZAM_RETRY_KEYNAME "[MENU]" -#define MAZEZAM_QUIT BUTTON_A -#define MAZEZAM_QUIT_KEYNAME "[A]" +#define MAZEZAM_RETRY BUTTON_A +#define MAZEZAM_RETRY_KEYNAME "[A]" +#define MAZEZAM_QUIT BUTTON_POWER +#define MAZEZAM_QUIT_KEYNAME "[POWER]" #elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define MAZEZAM_UP BUTTON_UP diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 3feec0fca7..e586f7b0fe 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c @@ -51,8 +51,8 @@ PLUGIN_IRAM_DECLARE #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define BTN_QUIT BUTTON_POWER #define BTN_RIGHT BUTTON_RIGHT -#define BTN_UP BUTTON_VOL_UP -#define BTN_DOWN BUTTON_VOL_DOWN +#define BTN_UP BUTTON_UP +#define BTN_DOWN BUTTON_DOWN #elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define BTN_QUIT BUTTON_POWER diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 668891fb3d..9dc983e4c1 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c @@ -98,9 +98,9 @@ enum minesweeper_status { #elif (CONFIG_KEYPAD == GIGABEAT_PAD) # define MINESWP_UP BUTTON_UP # define MINESWP_DOWN BUTTON_DOWN -# define MINESWP_QUIT BUTTON_A +# define MINESWP_QUIT BUTTON_POWER # define MINESWP_START BUTTON_SELECT -# define MINESWP_TOGGLE BUTTON_POWER +# define MINESWP_TOGGLE BUTTON_A # define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_INFO BUTTON_MENU diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 4e5928807c..0ccda0eaab 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c @@ -86,8 +86,8 @@ PLUGIN_HEADER #define MOSAIQUE_RESTART BUTTON_PLAY #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define MOSAIQUE_QUIT BUTTON_A -#define MOSAIQUE_SPEED BUTTON_MENU +#define MOSAIQUE_QUIT BUTTON_POWER +#define MOSAIQUE_SPEED BUTTON_A #define MOSAIQUE_RESTART BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_E200_PAD diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 5f852c43f4..70372933e0 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c @@ -2339,7 +2339,7 @@ void get_mp3_filename(char *wav_name) #elif CONFIG_KEYPAD == GIGABEAT_PAD #define MP3ENC_PREV BUTTON_UP #define MP3ENC_NEXT BUTTON_DOWN -#define MP3ENC_DONE BUTTON_A +#define MP3ENC_DONE BUTTON_POWER #define MP3ENC_SELECT BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_E200_PAD #define MP3ENC_PREV BUTTON_UP diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 5a8a4adc08..5b098dd7b4 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -137,7 +137,7 @@ PLUGIN_IRAM_DECLARE #elif CONFIG_KEYPAD == GIGABEAT_PAD #define MPEG_MENU BUTTON_MENU -#define MPEG_STOP BUTTON_A +#define MPEG_STOP BUTTON_POWER #define MPEG_PAUSE BUTTON_SELECT #define MPEG_VOLDOWN BUTTON_LEFT #define MPEG_VOLUP BUTTON_RIGHT diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index b332dd6de9..1ffe8b770c 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c @@ -92,8 +92,8 @@ PLUGIN_HEADER #define PONG_RIGHT_DOWN BUTTON_PLAY #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define PONG_QUIT BUTTON_A -#define PONG_PAUSE BUTTON_MENU +#define PONG_QUIT BUTTON_POWER +#define PONG_PAUSE BUTTON_SELECT #define PONG_LEFT_UP BUTTON_UP #define PONG_LEFT_DOWN BUTTON_DOWN #define PONG_RIGHT_UP BUTTON_VOL_UP diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index d5bf701b6f..2484d6eaaa 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -131,15 +131,15 @@ PLUGIN_HEADER #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define ROCKBLOX_OFF BUTTON_A +#define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN #define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP -#define ROCKBLOX_ROTATE BUTTON_UP +#define ROCKBLOX_ROTATE BUTTON_UP #define ROCKBLOX_DOWN BUTTON_DOWN #define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_DROP BUTTON_SELECT -#define ROCKBLOX_RESTART BUTTON_MENU +#define ROCKBLOX_RESTART BUTTON_A #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index cefa0e4f9e..6c99a3db18 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -120,7 +120,7 @@ void setoptions (void) #elif CONFIG_KEYPAD == GIGABEAT_PAD options.A=BUTTON_VOL_UP; options.B=BUTTON_VOL_DOWN; - options.START=BUTTON_POWER; + options.START=BUTTON_A; options.SELECT=BUTTON_SELECT; options.MENU=BUTTON_MENU; diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index a15d7b1141..da8f8052cb 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -71,11 +71,11 @@ PLUGIN_HEADER #define ROCKPAINT_RIGHT BUTTON_RIGHT #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define ROCKPAINT_QUIT BUTTON_A +#define ROCKPAINT_QUIT BUTTON_POWER #define ROCKPAINT_DRAW BUTTON_SELECT #define ROCKPAINT_MENU BUTTON_MENU -#define ROCKPAINT_TOOLBAR BUTTON_POWER -#define ROCKPAINT_TOOLBAR2 ( BUTTON_POWER | BUTTON_LEFT ) +#define ROCKPAINT_TOOLBAR BUTTON_A +#define ROCKPAINT_TOOLBAR2 ( BUTTON_A | BUTTON_LEFT ) #define ROCKPAINT_UP BUTTON_UP #define ROCKPAINT_DOWN BUTTON_DOWN #define ROCKPAINT_LEFT BUTTON_LEFT diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index dfc0811506..fa1ee0e443 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c @@ -70,11 +70,11 @@ PLUGIN_HEADER #define PUZZLE_PICTURE BUTTON_PLAY #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define PUZZLE_QUIT BUTTON_A +#define PUZZLE_QUIT BUTTON_POWER #define PUZZLE_UP BUTTON_UP #define PUZZLE_DOWN BUTTON_DOWN #define PUZZLE_SHUFFLE BUTTON_SELECT -#define PUZZLE_PICTURE BUTTON_POWER +#define PUZZLE_PICTURE BUTTON_A #elif (CONFIG_KEYPAD == SANSA_E200_PAD) #define PUZZLE_QUIT BUTTON_POWER diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 96412cbd22..fa357a8418 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c @@ -77,7 +77,7 @@ PLUGIN_HEADER #define SNAKE_PLAYPAUSE BUTTON_PLAY #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define SNAKE_QUIT BUTTON_A +#define SNAKE_QUIT BUTTON_POWER #define SNAKE_UP BUTTON_UP #define SNAKE_DOWN BUTTON_DOWN #define SNAKE_PLAYPAUSE BUTTON_SELECT diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 786f54d239..2a2665cab3 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c @@ -222,7 +222,7 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define SNAKE2_UP BUTTON_UP #define SNAKE2_DOWN BUTTON_DOWN -#define SNAKE2_QUIT BUTTON_A +#define SNAKE2_QUIT BUTTON_POWER #define SNAKE2_LEVEL_UP BUTTON_UP #define SNAKE2_LEVEL_DOWN BUTTON_DOWN #define SNAKE2_MAZE_NEXT BUTTON_RIGHT diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 555389019a..87422c1013 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c @@ -44,7 +44,7 @@ PLUGIN_HEADER #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define SNOW_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define SNOW_QUIT BUTTON_A +#define SNOW_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_E200_PAD #define SNOW_QUIT BUTTON_POWER #elif CONFIG_KEYPAD == IRIVER_H10_PAD diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index d9c3e64a03..40a2f549ad 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c @@ -136,11 +136,11 @@ enum { #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define SOKOBAN_UP BUTTON_UP #define SOKOBAN_DOWN BUTTON_DOWN -#define SOKOBAN_QUIT BUTTON_A +#define SOKOBAN_QUIT BUTTON_POWER #define SOKOBAN_UNDO BUTTON_SELECT -#define SOKOBAN_REDO BUTTON_POWER -#define SOKOBAN_LEVEL_UP (BUTTON_MENU | BUTTON_UP) -#define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_DOWN) +#define SOKOBAN_REDO BUTTON_A +#define SOKOBAN_LEVEL_UP BUTTON_VOL_UP +#define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN #define SOKOBAN_LEVEL_REPEAT BUTTON_MENU #elif (CONFIG_KEYPAD == SANSA_E200_PAD) @@ -967,12 +967,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_putsxy(3, 26, "[REC] Down a Level"); rb->lcd_putsxy(3, 36, "[PLAY] Up Level"); #elif CONFIG_KEYPAD == GIGABEAT_PAD - rb->lcd_putsxy(3, 6, "[A] Quit"); + rb->lcd_putsxy(3, 6, "[POWER] Quit"); rb->lcd_putsxy(3, 16, "[SELECT] Undo"); - rb->lcd_putsxy(3, 26, "[POWER] Redo"); - rb->lcd_putsxy(3, 36, "[MENU+DOWN] Down a Level"); + rb->lcd_putsxy(3, 26, "[A] Redo"); + rb->lcd_putsxy(3, 36, "[VOL-] Down a Level"); rb->lcd_putsxy(3, 46, "[MENU] Restart Level"); - rb->lcd_putsxy(3, 56, "[MENU+UP] Up Level"); + rb->lcd_putsxy(3, 56, "[VOL+] Up Level"); #elif CONFIG_KEYPAD == SANSA_E200_PAD rb->lcd_putsxy(3, 6, "[POWER] Quit"); rb->lcd_putsxy(3, 16, "[SELECT] Undo"); diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 9dbeaebfa4..0b5b9a5fa9 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c @@ -177,7 +177,7 @@ static struct plugin_api* rb; # define HK_REM2STACK "REC" #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -# define SOL_QUIT BUTTON_A +# define SOL_QUIT BUTTON_POWER # define SOL_UP BUTTON_UP # define SOL_DOWN BUTTON_DOWN # define SOL_LEFT BUTTON_LEFT @@ -185,14 +185,14 @@ static struct plugin_api* rb; # define SOL_MOVE_PRE BUTTON_SELECT # define SOL_MOVE (BUTTON_SELECT | BUTTON_REL) # define SOL_DRAW BUTTON_MENU -# define SOL_REM2CUR (BUTTON_LEFT | BUTTON_POWER) +# define SOL_REM2CUR (BUTTON_LEFT | BUTTON_A) # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) -# define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_POWER) +# define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_A) # define HK_MOVE "SELECT" # define HK_DRAW "MENU" -# define HK_REM2CUR "POWER+LEFT" +# define HK_REM2CUR "A+LEFT" # define HK_CUR2STACK "SELECT.." -# define HK_REM2STACK "POWER+RIGHT" +# define HK_REM2STACK "A+RIGHT" #elif (CONFIG_KEYPAD == SANSA_E200_PAD) # define SOL_QUIT BUTTON_POWER diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 74e65d8185..47be0cd6fe 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c @@ -107,8 +107,8 @@ static struct plugin_api* rb; /* global api struct pointer */ #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define AST_PAUSE BUTTON_POWER -#define AST_QUIT BUTTON_A +#define AST_PAUSE BUTTON_A +#define AST_QUIT BUTTON_POWER #define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT #define AST_THRUST BUTTON_UP #define AST_HYPERSPACE BUTTON_DOWN diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 071a0bb284..56cbe8c75d 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -134,14 +134,14 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define STAR_QUIT BUTTON_A +#define STAR_QUIT BUTTON_POWER #define STAR_UP BUTTON_UP #define STAR_DOWN BUTTON_DOWN -#define STAR_TOGGLE_CONTROL BUTTON_MENU -#define STAR_LEVEL_UP (BUTTON_POWER | BUTTON_UP) -#define STAR_LEVEL_DOWN (BUTTON_POWER | BUTTON_DOWN) -#define STAR_LEVEL_REPEAT (BUTTON_POWER | BUTTON_RIGHT) -#define STAR_MENU_RUN BUTTON_RIGHT +#define STAR_TOGGLE_CONTROL BUTTON_SELECT +#define STAR_LEVEL_UP BUTTON_VOL_UP +#define STAR_LEVEL_DOWN BUTTON_VOL_DOWN +#define STAR_LEVEL_REPEAT BUTTON_A +#define STAR_MENU_RUN BUTTON_SELECT #elif (CONFIG_KEYPAD == SANSA_E200_PAD) diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 586c8ae97d..a89ea236b9 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c @@ -46,7 +46,7 @@ static struct plugin_api* rb; /* global api struct pointer */ #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define STARFIELD_QUIT BUTTON_A +#define STARFIELD_QUIT BUTTON_POWER #define STARFIELD_INCREASE_ZMOVE BUTTON_UP #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 5b6e76cb81..0f52954abf 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c @@ -50,7 +50,7 @@ static bool abort; #define STATS_STOP_REMOTE BUTTON_RC_PLAY #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define STATS_STOP BUTTON_A +#define STATS_STOP BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_E200_PAD #define STATS_STOP BUTTON_POWER diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index a2dd647e90..9a66103429 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c @@ -93,9 +93,9 @@ PLUGIN_HEADER #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN #elif CONFIG_KEYPAD == GIGABEAT_PAD -#define STOPWATCH_QUIT BUTTON_A +#define STOPWATCH_QUIT BUTTON_POWER #define STOPWATCH_START_STOP BUTTON_SELECT -#define STOPWATCH_RESET_TIMER BUTTON_POWER +#define STOPWATCH_RESET_TIMER BUTTON_A #define STOPWATCH_LAP_TIMER BUTTON_MENU #define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 94fae58d9a..f850fcf327 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h @@ -91,14 +91,14 @@ #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define SUDOKU_BUTTON_QUIT BUTTON_A +#define SUDOKU_BUTTON_QUIT BUTTON_POWER #define SUDOKU_BUTTON_UP BUTTON_UP #define SUDOKU_BUTTON_DOWN BUTTON_DOWN #define SUDOKU_BUTTON_LEFT BUTTON_LEFT #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT #define SUDOKU_BUTTON_MENU BUTTON_MENU -#define SUDOKU_BUTTON_POSSIBLE BUTTON_POWER +#define SUDOKU_BUTTON_POSSIBLE BUTTON_A #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #define SUDOKU_BUTTON_QUIT BUTTON_POWER diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index fff64d4b7f..275cea326e 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c @@ -86,8 +86,8 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) #define VUMETER_QUIT BUTTON_POWER #define VUMETER_HELP BUTTON_A -#define VUMETER_MENU BUTTON_SELECT -#define VUMETER_MENU_EXIT BUTTON_SELECT +#define VUMETER_MENU BUTTON_MENU +#define VUMETER_MENU_EXIT BUTTON_MENU #define VUMETER_MENU_EXIT2 BUTTON_POWER #define VUMETER_LEFT BUTTON_LEFT #define VUMETER_RIGHT BUTTON_RIGHT diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 828bba3359..c4607cd618 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c @@ -139,8 +139,8 @@ PLUGIN_HEADER #define BTN_DIR_LEFT BUTTON_LEFT #define BTN_DIR_RIGHT BUTTON_RIGHT #define BTN_STARTPAUSE BUTTON_SELECT -#define BTN_QUIT BUTTON_A -#define BTN_STOPRESET BUTTON_POWER +#define BTN_QUIT BUTTON_POWER +#define BTN_STOPRESET BUTTON_A #define PLAYERS_TEXT "Up/Down" #define WORMS_TEXT "Left/Right" diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 49e730d2b2..51f89d2466 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c @@ -68,13 +68,13 @@ PLUGIN_HEADER #elif (CONFIG_KEYPAD == GIGABEAT_PAD) -#define QUIT BUTTON_A +#define QUIT BUTTON_POWER #define LEFT BUTTON_LEFT #define RIGHT BUTTON_RIGHT #define SELECT BUTTON_SELECT #define UP BUTTON_UP #define DOWN BUTTON_DOWN -#define PAUSE BUTTON_MENU +#define PAUSE BUTTON_A #elif (CONFIG_KEYPAD == SANSA_E200_PAD) diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 9bfcf5c4b0..39cbaa9f6f 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -82,7 +82,7 @@ #elif CONFIG_KEYPAD == GIGABEAT_PAD #define KBD_SELECT BUTTON_SELECT -#define KBD_ABORT BUTTON_A +#define KBD_ABORT BUTTON_POWER #define KBD_LEFT BUTTON_LEFT #define KBD_RIGHT BUTTON_RIGHT #define KBD_UP BUTTON_UP -- cgit v1.2.3