summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-02-05 21:18:19 +0000
committerDave Chapman <dave@dchapman.com>2006-02-05 21:18:19 +0000
commitcbfe90e4abd16e4ab2b9f3a6f9c24c55c4665a9a (patch)
tree1e0c2b891cc2b15ae02cc0188d9f9af7d2c4e1f6 /apps/gui
parentafb2564b8494115babc6ce4c496c28005c5a1599 (diff)
downloadrockbox-cbfe90e4abd16e4ab2b9f3a6f9c24c55c4665a9a.tar.gz
rockbox-cbfe90e4abd16e4ab2b9f3a6f9c24c55c4665a9a.zip
Use the iPod 4G button mappings for the iPod 3G as well (at least for now)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8591 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/gwps.h2
-rw-r--r--apps/gui/list.h2
-rw-r--r--apps/gui/select.h2
-rw-r--r--apps/gui/yesno.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 9209cb9b1b..4d586147af 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -175,7 +175,7 @@
175#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) 175#define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN)
176#define WPS_ID3 (BUTTON_MENU | BUTTON_ON) 176#define WPS_ID3 (BUTTON_MENU | BUTTON_ON)
177 177
178#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 178#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
179 179
180/* TODO: Check WPS button assignments */ 180/* TODO: Check WPS button assignments */
181 181
diff --git a/apps/gui/list.h b/apps/gui/list.h
index 8643c4d047..23a0fc37b8 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -73,7 +73,7 @@
73#define LIST_PGRIGHT (BUTTON_MENU | BUTTON_RIGHT) 73#define LIST_PGRIGHT (BUTTON_MENU | BUTTON_RIGHT)
74#define LIST_PGLEFT (BUTTON_MENU | BUTTON_LEFT) 74#define LIST_PGLEFT (BUTTON_MENU | BUTTON_LEFT)
75 75
76#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 76#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
77#define LIST_NEXT BUTTON_SCROLL_FWD 77#define LIST_NEXT BUTTON_SCROLL_FWD
78#define LIST_PREV BUTTON_SCROLL_BACK 78#define LIST_PREV BUTTON_SCROLL_BACK
79 79
diff --git a/apps/gui/select.h b/apps/gui/select.h
index 00c05c8d58..d0e545bd51 100644
--- a/apps/gui/select.h
+++ b/apps/gui/select.h
@@ -54,7 +54,7 @@
54#define SELECT_CANCEL BUTTON_STOP 54#define SELECT_CANCEL BUTTON_STOP
55#define SELECT_CANCEL2 BUTTON_MENU 55#define SELECT_CANCEL2 BUTTON_MENU
56 56
57#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 57#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
58#define SELECT_INC BUTTON_SCROLL_FWD 58#define SELECT_INC BUTTON_SCROLL_FWD
59#define SELECT_DEC BUTTON_SCROLL_BACK 59#define SELECT_DEC BUTTON_SCROLL_BACK
60#define SELECT_OK BUTTON_SELECT 60#define SELECT_OK BUTTON_SELECT
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h
index a39a2cbc69..20df1b5037 100644
--- a/apps/gui/yesno.h
+++ b/apps/gui/yesno.h
@@ -23,7 +23,7 @@
23#elif CONFIG_KEYPAD == GMINI100_PAD 23#elif CONFIG_KEYPAD == GMINI100_PAD
24#define YESNO_OK BUTTON_PLAY 24#define YESNO_OK BUTTON_PLAY
25 25
26#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 26#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
27#define YESNO_OK BUTTON_RIGHT 27#define YESNO_OK BUTTON_RIGHT
28 28
29#elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) 29#elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD)