summaryrefslogtreecommitdiffstats
path: root/apps/tree.h
diff options
context:
space:
mode:
authorZakk Roberts <midk@rockbox.org>2006-04-10 03:51:17 +0000
committerZakk Roberts <midk@rockbox.org>2006-04-10 03:51:17 +0000
commit2f943b054c4eb630c9b5b7170da38e494c1be235 (patch)
treea72d3e22c88f7ddb67e9a8d01a94e9927001c702 /apps/tree.h
parentbf6f9c66a158a478d639672857bbf9bac791dd30 (diff)
downloadrockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.tar.gz
rockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.tar.bz2
rockbox-2f943b054c4eb630c9b5b7170da38e494c1be235.zip
Enabled the quickscreen for iAudio X5. Globally, REC enters the menu and holding REC enters the quickscreen. Also moved the quickscreen #define to model config files, which simplifies the checking for it and makes checking more consistent. Cleaned up keymappings in quickscreen.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9590 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.h')
-rw-r--r--apps/tree.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/apps/tree.h b/apps/tree.h
index c811b5d98a..29532b5304 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -37,7 +37,6 @@
#define TREE_WPS_PRE BUTTON_ON
#define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
#define TREE_CONTEXT2 (BUTTON_ON | BUTTON_SELECT)
-#define TREE_POWER_BTN BUTTON_ON
#define TREE_QUICK (BUTTON_MODE | BUTTON_REPEAT)
/* Remote keys */
@@ -67,7 +66,6 @@
#define TREE_WPS_PRE BUTTON_ON
#define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT)
#define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY)
-#define TREE_POWER_BTN BUTTON_ON
#define TREE_QUICK BUTTON_F2
#define TREE_RC_NEXT BUTTON_RC_RIGHT
@@ -85,7 +83,6 @@
#define TREE_WPS_PRE BUTTON_ON
#define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT)
#define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY)
-#define TREE_POWER_BTN BUTTON_ON
#define TREE_RC_NEXT BUTTON_RC_RIGHT
#define TREE_RC_PREV BUTTON_RC_LEFT
@@ -103,7 +100,6 @@
#define TREE_WPS (BUTTON_MENU | BUTTON_REL)
#define TREE_WPS_PRE BUTTON_MENU
#define TREE_CONTEXT (BUTTON_RIGHT | BUTTON_REPEAT)
-#define TREE_POWER_BTN BUTTON_OFF
#elif CONFIG_KEYPAD == GMINI100_PAD
#define TREE_EXIT BUTTON_LEFT
@@ -115,7 +111,6 @@
#define TREE_WPS_PRE BUTTON_ON
#define TREE_CONTEXT (BUTTON_PLAY | BUTTON_REPEAT)
#define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY)
-#define TREE_POWER_BTN BUTTON_ON
#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
@@ -142,7 +137,6 @@
#define TREE_WPS (BUTTON_SELECT | BUTTON_REL)
#define TREE_WPS_PRE BUTTON_SELECT
#define TREE_CONTEXT (BUTTON_RIGHT | BUTTON_REPEAT)
-#define TREE_POWER_BTN (BUTTON_PLAY | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
@@ -151,12 +145,12 @@
#define TREE_ENTER BUTTON_RIGHT
#define TREE_RUN (BUTTON_SELECT | BUTTON_REL)
#define TREE_RUN_PRE BUTTON_SELECT
-#define TREE_MENU (BUTTON_REC | BUTTON_REPEAT)
+#define TREE_MENU (BUTTON_REC | BUTTON_REL)
#define TREE_MENU_PRE BUTTON_REC
#define TREE_WPS (BUTTON_PLAY | BUTTON_REL)
#define TREE_WPS_PRE BUTTON_PLAY
#define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
-#define TREE_POWER_BTN (BUTTON_REC | BUTTON_REPEAT)
+#define TREE_QUICK (BUTTON_REC | BUTTON_REPEAT)
#elif CONFIG_KEYPAD == GIGABEAT_PAD
@@ -172,7 +166,6 @@
#define TREE_WPS (BUTTON_POWER | BUTTON_REL)
#define TREE_WPS_PRE BUTTON_POWER
#define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT)
-#define TREE_POWER_BTN BUTTON_POWER
#endif