Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 1 insertions, 110 deletions

diff --git a/apps/settings.h b/apps/settings.h
index 439a43809a..27f00584a6 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -45,115 +45,6 @@
 
 #define MAX_FILENAME 20
 
-/* button definitions */
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-  (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_SELECT
-#define SETTINGS_OK2     BUTTON_LEFT
-#define SETTINGS_CANCEL  BUTTON_OFF
-#define SETTINGS_CANCEL2 BUTTON_MODE
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_ON
-
-#define SETTINGS_RC_INC     BUTTON_RC_FF
-#define SETTINGS_RC_DEC     BUTTON_RC_REW
-#define SETTINGS_RC_OK      BUTTON_RC_MENU
-#define SETTINGS_RC_OK2     BUTTON_RC_SOURCE
-#define SETTINGS_RC_CANCEL  BUTTON_RC_STOP
-#define SETTINGS_RC_CANCEL2 BUTTON_RC_MODE
-#define SETTINGS_RC_PREV    BUTTON_RC_SOURCE
-#define SETTINGS_RC_NEXT    BUTTON_RC_BITRATE
-#define SETTINGS_RC_ACCEPT  BUTTON_RC_ON
-
-#elif CONFIG_KEYPAD == RECORDER_PAD
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_PLAY
-#define SETTINGS_OK2     BUTTON_LEFT
-#define SETTINGS_CANCEL  BUTTON_OFF
-#define SETTINGS_CANCEL2 BUTTON_F1
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_ON
-
-#elif CONFIG_KEYPAD == PLAYER_PAD
-#define SETTINGS_INC     BUTTON_RIGHT
-#define SETTINGS_DEC     BUTTON_LEFT
-#define SETTINGS_OK      BUTTON_PLAY
-#define SETTINGS_CANCEL  BUTTON_STOP
-#define SETTINGS_CANCEL2 BUTTON_MENU
-#define SETTINGS_ACCEPT  BUTTON_ON
-
-#elif CONFIG_KEYPAD == ONDIO_PAD
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_RIGHT
-#define SETTINGS_OK2     BUTTON_LEFT
-#define SETTINGS_CANCEL  BUTTON_MENU
-#define SETTINGS_CANCEL2 BUTTON_OFF
-
-#elif CONFIG_KEYPAD == GMINI100_PAD
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_PLAY
-#define SETTINGS_OK2     BUTTON_LEFT
-#define SETTINGS_CANCEL  BUTTON_OFF
-#define SETTINGS_CANCEL2 BUTTON_MENU
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
-#define SETTINGS_INC     BUTTON_SCROLL_FWD
-#define SETTINGS_DEC     BUTTON_SCROLL_BACK
-#define SETTINGS_OK      BUTTON_SELECT
-#define SETTINGS_CANCEL  BUTTON_MENU
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_SELECT
-#define SETTINGS_CANCEL  BUTTON_PLAY
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-
-#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_SELECT
-#define SETTINGS_OK2     BUTTON_LEFT
-#define SETTINGS_CANCEL  BUTTON_REC
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define SETTINGS_INC     BUTTON_UP
-#define SETTINGS_DEC     BUTTON_DOWN
-#define SETTINGS_OK      BUTTON_MENU
-#define SETTINGS_CANCEL  BUTTON_A
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_SELECT
-
-#elif CONFIG_KEYPAD == IRIVER_H10_PAD
-#define SETTINGS_INC     BUTTON_SCROLL_UP
-#define SETTINGS_DEC     BUTTON_SCROLL_DOWN
-#define SETTINGS_OK      BUTTON_PLAY
-#define SETTINGS_OK2     BUTTON_LEFT
-#define SETTINGS_CANCEL  BUTTON_REW
-#define SETTINGS_PREV    BUTTON_LEFT
-#define SETTINGS_NEXT    BUTTON_RIGHT
-#define SETTINGS_ACCEPT  BUTTON_FF
-
-#endif
-
 /* data structures */
 
 #define BOOKMARK_NO  0
@@ -564,7 +455,7 @@ struct user_settings
     int eq_hw_band4_cutoff;
     int eq_hw_band4_gain;
 #endif
-
+    bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */
     int show_path_in_browser; /* 0=off, 1=current directory, 2=full path */
 };