diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-08-08 07:21:37 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-08-08 07:21:37 +0000 |
commit | 4caf3b3aa0247fcac7b621cdec15bef29dd22422 (patch) | |
tree | d10dd64af043c79cc610351fcc95ef3505cddbeb | |
parent | 89e5333bc18e0e2fcb0ed541a8bfa9479cbe830a (diff) | |
download | rockbox-4caf3b3aa0247fcac7b621cdec15bef29dd22422.tar.gz rockbox-4caf3b3aa0247fcac7b621cdec15bef29dd22422.zip |
M:Robe 500: Make yes/no screen work better and add appropriate strings for some screens. Rockboy: Improve m:robe 500 default keymap.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22201 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-mr500.c | 3 | ||||
-rw-r--r-- | apps/lang/english.lang | 5 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c index aa04461b64..b1a3e4aae1 100644 --- a/apps/keymaps/keymap-mr500.c +++ b/apps/keymaps/keymap-mr500.c | |||
@@ -138,7 +138,8 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
138 | }; /* button_context_settingsgraphical */ | 138 | }; /* button_context_settingsgraphical */ |
139 | 139 | ||
140 | static const struct button_mapping button_context_yesno[] = { | 140 | static const struct button_mapping button_context_yesno[] = { |
141 | { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_NONE }, | 141 | { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE }, |
142 | { ACTION_YESNO_ACCEPT, BUTTON_POWER, BUTTON_NONE }, | ||
142 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 143 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
143 | }; /* button_context_settings_yesno */ | 144 | }; /* button_context_settings_yesno */ |
144 | 145 | ||
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 2543060486..2e4cb2d96f 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -341,6 +341,7 @@ | |||
341 | *: "PLAY = Yes" | 341 | *: "PLAY = Yes" |
342 | h100,h120,h300: "NAVI = Yes" | 342 | h100,h120,h300: "NAVI = Yes" |
343 | yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" | 343 | yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" |
344 | mrobe500: "PLAY or POWER = Yes" | ||
344 | player: "(PLAY/STOP)" | 345 | player: "(PLAY/STOP)" |
345 | </dest> | 346 | </dest> |
346 | <voice> | 347 | <voice> |
@@ -4217,6 +4218,7 @@ | |||
4217 | <source> | 4218 | <source> |
4218 | *: none | 4219 | *: none |
4219 | rtc: "ON = Set" | 4220 | rtc: "ON = Set" |
4221 | mrobe500: "HEART = Set" | ||
4220 | h100,h120,h300: "NAVI = Set" | 4222 | h100,h120,h300: "NAVI = Set" |
4221 | ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" | 4223 | ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" |
4222 | sa9200: "PLAY = Set" | 4224 | sa9200: "PLAY = Set" |
@@ -4224,6 +4226,7 @@ | |||
4224 | <dest> | 4226 | <dest> |
4225 | *: none | 4227 | *: none |
4226 | rtc: "ON = Set" | 4228 | rtc: "ON = Set" |
4229 | mrobe500: "HEART = Set" | ||
4227 | h100,h120,h300: "NAVI = Set" | 4230 | h100,h120,h300: "NAVI = Set" |
4228 | ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" | 4231 | ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" |
4229 | sa9200: "PLAY = Set" | 4232 | sa9200: "PLAY = Set" |
@@ -4240,6 +4243,7 @@ | |||
4240 | <source> | 4243 | <source> |
4241 | *: none | 4244 | *: none |
4242 | rtc: "OFF = Revert" | 4245 | rtc: "OFF = Revert" |
4246 | mrobe500: "POWER = Revert" | ||
4243 | h100,h120,h300: "STOP = Revert" | 4247 | h100,h120,h300: "STOP = Revert" |
4244 | ipod*,c200*: "MENU = Revert" | 4248 | ipod*,c200*: "MENU = Revert" |
4245 | x5,m5: "RECORD = Revert" | 4249 | x5,m5: "RECORD = Revert" |
@@ -4252,6 +4256,7 @@ | |||
4252 | <dest> | 4256 | <dest> |
4253 | *: none | 4257 | *: none |
4254 | rtc: "OFF = Revert" | 4258 | rtc: "OFF = Revert" |
4259 | mrobe500: "POWER = Revert" | ||
4255 | h100,h120,h300: "STOP = Revert" | 4260 | h100,h120,h300: "STOP = Revert" |
4256 | ipod*,c200*: "MENU = Revert" | 4261 | ipod*,c200*: "MENU = Revert" |
4257 | x5,m5: "RECORD = Revert" | 4262 | x5,m5: "RECORD = Revert" |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 85040b2cd6..ed75fb7d17 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -196,15 +196,6 @@ static void setoptions (void) | |||
196 | options.MENU=BUTTON_POWER; | 196 | options.MENU=BUTTON_POWER; |
197 | 197 | ||
198 | #elif CONFIG_KEYPAD == MROBE500_PAD | 198 | #elif CONFIG_KEYPAD == MROBE500_PAD |
199 | options.UP=BUTTON_RC_PLAY; | ||
200 | options.DOWN=BUTTON_RC_DOWN; | ||
201 | options.LEFT=BUTTON_RC_REW; | ||
202 | options.RIGHT=BUTTON_RC_FF; | ||
203 | |||
204 | options.A=BUTTON_RC_VOL_DOWN; | ||
205 | options.B=BUTTON_RC_VOL_UP; | ||
206 | options.START=BUTTON_RC_HEART; | ||
207 | options.SELECT=BUTTON_RC_MODE; | ||
208 | options.MENU=BUTTON_POWER; | 199 | options.MENU=BUTTON_POWER; |
209 | 200 | ||
210 | #elif CONFIG_KEYPAD == COWOND2_PAD | 201 | #elif CONFIG_KEYPAD == COWOND2_PAD |
@@ -275,7 +266,10 @@ static void setoptions (void) | |||
275 | options.DOWN=BUTTON_BOTTOMMIDDLE; | 266 | options.DOWN=BUTTON_BOTTOMMIDDLE; |
276 | options.START=BUTTON_TOPRIGHT; | 267 | options.START=BUTTON_TOPRIGHT; |
277 | options.SELECT=BUTTON_CENTER; | 268 | options.SELECT=BUTTON_CENTER; |
278 | #if CONFIG_KEYPAD != COWOND2_PAD | 269 | #if CONFIG_KEYPAD == MROBE500_PAD |
270 | options.A=BUTTON_BOTTOMLEFT; | ||
271 | options.B=BUTTON_BOTTOMRIGHT; | ||
272 | #elif CONFIG_KEYPAD != COWOND2_PAD | ||
279 | options.A=BUTTON_BOTTOMLEFT; | 273 | options.A=BUTTON_BOTTOMLEFT; |
280 | options.B=BUTTON_BOTTOMRIGHT; | 274 | options.B=BUTTON_BOTTOMRIGHT; |
281 | options.MENU=BUTTON_TOPLEFT; | 275 | options.MENU=BUTTON_TOPLEFT; |