From 1f45cce4262bde3f91844701085076892b4743f8 Mon Sep 17 00:00:00 2001 From: Christi Scarborough Date: Wed, 29 Jun 2005 08:10:19 +0000 Subject: [PATCH] Move quick menu to MODE button to avoid conflict with page up/down in WPS git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6910 a1c6a512-1295-4272-9138-f99709370657 --- apps/screens.h | 2 +- apps/tree.h | 5 +++-- apps/wps.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/screens.h b/apps/screens.h index e1935e6273..a3940db76b 100644 --- a/apps/screens.h +++ b/apps/screens.h @@ -39,7 +39,7 @@ bool quick_screen(const int, const int); #if CONFIG_KEYPAD == IRIVER_H100_PAD bool quick_screen(const int, const int); -#define SCREENS_QUICK BUTTON_ON +#define SCREENS_QUICK BUTTON_MODE /* Long press already detected so not needed here */ #endif diff --git a/apps/tree.h b/apps/tree.h index 2c973cc358..a105004d73 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -30,7 +30,8 @@ #define TREE_ENTER BUTTON_RIGHT #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) #define TREE_RUN_PRE BUTTON_SELECT -#define TREE_MENU BUTTON_MODE +#define TREE_MENU ( BUTTON_MODE | BUTTON_REL) +#define TREE_MENU_PRE BUTTON_MODE #define TREE_OFF BUTTON_OFF #define TREE_WPS (BUTTON_ON | BUTTON_REL) #define TREE_WPS_PRE BUTTON_ON @@ -39,7 +40,7 @@ #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT) #define TREE_POWER_BTN BUTTON_ON -#define TREE_QUICK (BUTTON_ON | BUTTON_REPEAT) +#define TREE_QUICK (BUTTON_MODE | BUTTON_REPEAT) #define TREE_RC_NEXT BUTTON_RC_FF #define TREE_RC_PREV BUTTON_RC_REW diff --git a/apps/wps.h b/apps/wps.h index 3fac42d648..c9c872d35e 100644 --- a/apps/wps.h +++ b/apps/wps.h @@ -40,7 +40,7 @@ #define WPS_EXIT BUTTON_OFF #define WPS_ID3 (BUTTON_MODE | BUTTON_ON) #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) -#define WPS_QUICK (BUTTON_ON | BUTTON_REPEAT) +#define WPS_QUICK (BUTTON_MODE | BUTTON_REPEAT) #define WPS_RC_NEXT (BUTTON_RC_FF | BUTTON_REL) #define WPS_RC_NEXT_PRE BUTTON_RC_FF