Simplify the bookmark delete action. Combos don't need precondition checking. Also make this combo work in the bookmark screen if ON is pressed first. ON on its own is one of the OK actions in the chained context on these targets, so it must be suppressed here.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20066 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2009-02-20 17:48:43 +00:00
parent 3e67e3b1f0
commit 5c5b06ba39
3 changed files with 6 additions and 6 deletions

View file

@ -199,8 +199,8 @@ static const struct button_mapping button_context_keyboard[] = {
}; /* button_context_keyboard */
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_SELECT },
{ ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_ON },
{ ACTION_NONE, BUTTON_ON, BUTTON_NONE },
{ ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),

View file

@ -89,8 +89,8 @@ static const struct button_mapping button_context_yesno[] = {
}; /* button_context_settings_yesno */
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
{ ACTION_NONE, BUTTON_ON, BUTTON_NONE },
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
}; /* button_context_settings_bmark */

View file

@ -201,8 +201,8 @@ static const struct button_mapping button_context_keyboard[] = {
}; /* button_context_keyboard */
static const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
{ ACTION_NONE, BUTTON_ON, BUTTON_NONE },
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),