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
This commit is contained in:
Karl Kurbjun 2009-08-08 07:21:37 +00:00
parent 89e5333bc1
commit 4caf3b3aa0
3 changed files with 11 additions and 11 deletions

View file

@ -138,7 +138,8 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
}; /* button_context_settingsgraphical */ }; /* button_context_settingsgraphical */
static const struct button_mapping button_context_yesno[] = { static const struct button_mapping button_context_yesno[] = {
{ ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_NONE }, { ACTION_YESNO_ACCEPT, BUTTON_RC_PLAY, BUTTON_NONE },
{ ACTION_YESNO_ACCEPT, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_settings_yesno */ }; /* button_context_settings_yesno */

View file

@ -341,6 +341,7 @@
*: "PLAY = Yes" *: "PLAY = Yes"
h100,h120,h300: "NAVI = Yes" h100,h120,h300: "NAVI = Yes"
yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes"
mrobe500: "PLAY or POWER = Yes"
player: "(PLAY/STOP)" player: "(PLAY/STOP)"
</dest> </dest>
<voice> <voice>
@ -4217,6 +4218,7 @@
<source> <source>
*: none *: none
rtc: "ON = Set" rtc: "ON = Set"
mrobe500: "HEART = Set"
h100,h120,h300: "NAVI = Set" h100,h120,h300: "NAVI = Set"
ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
sa9200: "PLAY = Set" sa9200: "PLAY = Set"
@ -4224,6 +4226,7 @@
<dest> <dest>
*: none *: none
rtc: "ON = Set" rtc: "ON = Set"
mrobe500: "HEART = Set"
h100,h120,h300: "NAVI = Set" h100,h120,h300: "NAVI = Set"
ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set"
sa9200: "PLAY = Set" sa9200: "PLAY = Set"
@ -4240,6 +4243,7 @@
<source> <source>
*: none *: none
rtc: "OFF = Revert" rtc: "OFF = Revert"
mrobe500: "POWER = Revert"
h100,h120,h300: "STOP = Revert" h100,h120,h300: "STOP = Revert"
ipod*,c200*: "MENU = Revert" ipod*,c200*: "MENU = Revert"
x5,m5: "RECORD = Revert" x5,m5: "RECORD = Revert"
@ -4252,6 +4256,7 @@
<dest> <dest>
*: none *: none
rtc: "OFF = Revert" rtc: "OFF = Revert"
mrobe500: "POWER = Revert"
h100,h120,h300: "STOP = Revert" h100,h120,h300: "STOP = Revert"
ipod*,c200*: "MENU = Revert" ipod*,c200*: "MENU = Revert"
x5,m5: "RECORD = Revert" x5,m5: "RECORD = Revert"

View file

@ -196,15 +196,6 @@ static void setoptions (void)
options.MENU=BUTTON_POWER; options.MENU=BUTTON_POWER;
#elif CONFIG_KEYPAD == MROBE500_PAD #elif CONFIG_KEYPAD == MROBE500_PAD
options.UP=BUTTON_RC_PLAY;
options.DOWN=BUTTON_RC_DOWN;
options.LEFT=BUTTON_RC_REW;
options.RIGHT=BUTTON_RC_FF;
options.A=BUTTON_RC_VOL_DOWN;
options.B=BUTTON_RC_VOL_UP;
options.START=BUTTON_RC_HEART;
options.SELECT=BUTTON_RC_MODE;
options.MENU=BUTTON_POWER; options.MENU=BUTTON_POWER;
#elif CONFIG_KEYPAD == COWOND2_PAD #elif CONFIG_KEYPAD == COWOND2_PAD
@ -275,7 +266,10 @@ static void setoptions (void)
options.DOWN=BUTTON_BOTTOMMIDDLE; options.DOWN=BUTTON_BOTTOMMIDDLE;
options.START=BUTTON_TOPRIGHT; options.START=BUTTON_TOPRIGHT;
options.SELECT=BUTTON_CENTER; options.SELECT=BUTTON_CENTER;
#if CONFIG_KEYPAD != COWOND2_PAD #if CONFIG_KEYPAD == MROBE500_PAD
options.A=BUTTON_BOTTOMLEFT;
options.B=BUTTON_BOTTOMRIGHT;
#elif CONFIG_KEYPAD != COWOND2_PAD
options.A=BUTTON_BOTTOMLEFT; options.A=BUTTON_BOTTOMLEFT;
options.B=BUTTON_BOTTOMRIGHT; options.B=BUTTON_BOTTOMRIGHT;
options.MENU=BUTTON_TOPLEFT; options.MENU=BUTTON_TOPLEFT;