Index: apps/plugins/flipit.c =================================================================== --- apps/plugins/flipit.c (révision 31528) +++ apps/plugins/flipit.c (copie de travail) @@ -365,7 +365,7 @@ #define FLIPIT_QUIT BUTTON_POWER #define FLIPIT_SHUFFLE BUTTON_PLAYPAUSE #define FLIPIT_SOLVE BUTTON_BACK -#define FLIPIT_STEP_BY_STEP (BUTTON_BACK|BUTTON_PLAYPAUSE) +#define FLIPIT_STEP_BY_STEP BUTTON_BOTTOMLEFT #define FLIPIT_TOGGLE BUTTON_SELECT #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD Index: apps/plugins/chessbox/chessbox_pgn.h =================================================================== --- apps/plugins/chessbox/chessbox_pgn.h (révision 31528) +++ apps/plugins/chessbox/chessbox_pgn.h (copie de travail) @@ -402,9 +402,10 @@ #define CB_DOWN BUTTON_DOWN #define CB_LEFT BUTTON_LEFT #define CB_RIGHT BUTTON_RIGHT -#define CB_PLAY BUTTON_PLAYPAUSE -#define CB_LEVEL BUTTON_BACK -#define CB_MENU (BUTTON_PLAYPAUSE | BUTTON_REPEAT) +#define CB_PLAY (BUTTON_PLAYPAUSE | BUTTON_REPEAT) +#define CB_LEVEL BUTTON_BOTTOMRIGHT +#define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT) +#define CB_MENU BUTTON_POWER #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define CB_SELECT BUTTON_SELECT Index: apps/plugins/clix.c =================================================================== --- apps/plugins/clix.c (révision 31528) +++ apps/plugins/clix.c (copie de travail) @@ -190,10 +190,10 @@ #define CLIX_BUTTON_QUIT BUTTON_POWER #define CLIX_BUTTON_UP BUTTON_UP #define CLIX_BUTTON_DOWN BUTTON_DOWN -#define CLIX_BUTTON_SCROLL_FWD BUTTON_BACK -#define CLIX_BUTTON_SCROLL_BACK BUTTON_PLAYPAUSE #define CLIX_BUTTON_LEFT BUTTON_LEFT #define CLIX_BUTTON_RIGHT BUTTON_RIGHT +#define CLIX_BUTTON_SCROLL_FWD BUTTON_BOTTOMRIGHT +#define CLIX_BUTTON_SCROLL_BACK BUTTON_BOTTOMLEFT #define CLIX_BUTTON_CLICK BUTTON_SELECT #else Index: apps/plugins/lib/pluginlib_actions.c =================================================================== --- apps/plugins/lib/pluginlib_actions.c (révision 31528) +++ apps/plugins/lib/pluginlib_actions.c (copie de travail) @@ -403,7 +403,7 @@ {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, - {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, + {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, Index: apps/plugins/blackjack.c =================================================================== --- apps/plugins/blackjack.c (révision 31528) +++ apps/plugins/blackjack.c (copie de travail) @@ -459,8 +459,10 @@ #define BJACK_DOUBLE_NAME "BACK" #define BJACK_SELECT BUTTON_SELECT #define BJACK_QUIT BUTTON_POWER -#define BJACK_STAY BUTTON_PLAYPAUSE -#define BJACK_DOUBLEDOWN BUTTON_BACK +#define BJACK_MAX BUTTON_BOTTOMRIGHT +#define BJACK_MIN BUTTON_BOTTOMLEFT +#define BJACK_STAY BUTTON_BACK +#define BJACK_DOUBLEDOWN BUTTON_PLAYPAUSE #define BJACK_UP BUTTON_UP #define BJACK_DOWN BUTTON_DOWN #define BJACK_RIGHT BUTTON_RIGHT Index: apps/plugins/doom/i_video.c =================================================================== --- apps/plugins/doom/i_video.c (révision 31528) +++ apps/plugins/doom/i_video.c (copie de travail) @@ -168,6 +168,7 @@ #define DOOMBUTTON_SHOOT BUTTON_PLAY #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_OPEN BUTTON_MENU + #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -178,6 +179,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_REC + #elif CONFIG_KEYPAD == IRIVER_H10_PAD #define DOOMBUTTON_UP BUTTON_SCROLL_UP #define DOOMBUTTON_DOWN BUTTON_SCROLL_DOWN @@ -188,6 +190,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_REW #define DOOMBUTTON_WEAPON BUTTON_FF + #elif CONFIG_KEYPAD == SANSA_E200_PAD #define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK @@ -201,6 +204,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW + #elif CONFIG_KEYPAD == SANSA_FUZE_PAD #define DOOMBUTTON_SCROLLWHEEL #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK @@ -214,6 +218,7 @@ #define DOOMBUTTON_ESC BUTTON_HOME #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW + #elif CONFIG_KEYPAD == SANSA_C200_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -224,6 +229,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_UP + #elif CONFIG_KEYPAD == SANSA_CLIP_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -234,6 +240,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_UP + #elif CONFIG_KEYPAD == GIGABEAT_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -245,6 +252,7 @@ #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -256,6 +264,7 @@ #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == MROBE500_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_UP BUTTON_RC_PLAY @@ -266,6 +275,7 @@ #define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP #define DOOMBUTTON_ENTER BUTTON_RC_MODE #define DOOMBUTTON_WEAPON BUTTON_RC_HEART + #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \ CONFIG_KEYPAD == IRIVER_H300_PAD #define DOOMBUTTON_UP BUTTON_UP @@ -277,6 +287,7 @@ #define DOOMBUTTON_ESC BUTTON_OFF #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_ON + #elif CONFIG_KEYPAD == IAUDIO_M3_PAD #define DOOMBUTTON_ESC BUTTON_RC_REC #define DOOMBUTTON_UP BUTTON_RC_VOL_UP @@ -287,11 +298,13 @@ #define DOOMBUTTON_SHOOT BUTTON_RC_MODE #define DOOMBUTTON_ENTER BUTTON_RC_PLAY #define DOOMBUTTON_WEAPON BUTTON_RC_MENU + #elif CONFIG_KEYPAD == COWON_D2_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_SHOOT BUTTON_PLUS #define DOOMBUTTON_WEAPON BUTTON_MINUS #define DOOMBUTTON_MAP BUTTON_MENU + #elif CONFIG_KEYPAD == MROBE100_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -302,6 +315,7 @@ #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_DISPLAY + #elif CONFIG_KEYPAD == IAUDIO67_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_UP BUTTON_STOP @@ -311,6 +325,7 @@ #define DOOMBUTTON_SHOOT BUTTON_VOLUP #define DOOMBUTTON_OPEN BUTTON_VOLDOWN #define DOOMBUTTON_ENTER BUTTON_MENU + #elif CONFIG_KEYPAD == CREATIVEZVM_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -322,6 +337,7 @@ #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON BUTTON_MENU #define DOOMBUTTON_MAP BUTTON_CUSTOM + #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -333,6 +349,7 @@ #define DOOMBUTTON_ENTER BUTTON_VIEW #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -344,6 +361,7 @@ #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -355,13 +373,16 @@ #define DOOMBUTTON_ENTER BUTTON_LEFT #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_VOL_UP + #elif CONFIG_KEYPAD == ONDAVX747_PAD #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_SHOOT BUTTON_VOL_UP #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN #define DOOMBUTTON_MAP BUTTON_MENU + #elif CONFIG_KEYPAD == ONDAVX777_PAD #define DOOMBUTTON_ESC BUTTON_POWER + #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -373,6 +394,7 @@ #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) + #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #define DOOMBUTTON_UP BUTTON_OK #define DOOMBUTTON_DOWN BUTTON_CANCEL @@ -383,6 +405,7 @@ #define DOOMBUTTON_ESC BUTTON_REC #define DOOMBUTTON_ENTER BUTTON_POWER #define DOOMBUTTON_WEAPON BUTTON_PLAY + #elif CONFIG_KEYPAD == MPIO_HD200_PAD #define DOOMBUTTON_UP BUTTON_REW #define DOOMBUTTON_DOWN BUTTON_FF @@ -393,6 +416,7 @@ #define DOOMBUTTON_ESC BUTTON_REC #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) + #elif CONFIG_KEYPAD == MPIO_HD300_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN @@ -403,16 +427,20 @@ #define DOOMBUTTON_ESC BUTTON_REC #define DOOMBUTTON_ENTER BUTTON_PLAY #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) + #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN #define DOOMBUTTON_LEFT BUTTON_LEFT #define DOOMBUTTON_RIGHT BUTTON_RIGHT -#define DOOMBUTTON_SHOOT BUTTON_SELECT #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE +#define DOOMBUTTON_QUIT BUTTON_POWER #define DOOMBUTTON_ESC BUTTON_BACK -#define DOOMBUTTON_ENTER (BUTTON_PLAYPAUSE|BUTTON_REPEAT) -#define DOOMBUTTON_WEAPON (BUTTON_SELECT|BUTTON_REPEAT) +#define DOOMBUTTON_ENTER BUTTON_SELECT +#define DOOMBUTTON_SHOOT BUTTON_SELECT +#define DOOMBUTTON_WEAPON BUTTON_BOTTOMLEFT +#define DOOMBUTTON_MAP BUTTON_BOTTOMRIGHT + #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN