diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2009-02-20 17:48:43 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2009-02-20 17:48:43 +0000 |
| commit | 5c5b06ba39d2f00d70baef66a90c9e3d6c497817 (patch) | |
| tree | 190c259db1a0411857db4b530d7a98e4d55f5e1b | |
| parent | 3e67e3b1f06488f67d2ebbf844ff40893cc16bf0 (diff) | |
| download | rockbox-5c5b06ba39d2f00d70baef66a90c9e3d6c497817.tar.gz rockbox-5c5b06ba39d2f00d70baef66a90c9e3d6c497817.zip | |
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
| -rw-r--r-- | apps/keymaps/keymap-av300.c | 4 | ||||
| -rw-r--r-- | apps/keymaps/keymap-player.c | 4 | ||||
| -rw-r--r-- | apps/keymaps/keymap-recorder.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c index e528b9f311..6c91499a50 100644 --- a/apps/keymaps/keymap-av300.c +++ b/apps/keymaps/keymap-av300.c | |||
| @@ -199,8 +199,8 @@ static const struct button_mapping button_context_keyboard[] = { | |||
| 199 | }; /* button_context_keyboard */ | 199 | }; /* button_context_keyboard */ |
| 200 | 200 | ||
| 201 | static const struct button_mapping button_context_bmark[] = { | 201 | static const struct button_mapping button_context_bmark[] = { |
| 202 | { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_SELECT }, | 202 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, |
| 203 | { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_ON }, | 203 | { ACTION_BMS_DELETE, BUTTON_SELECT|BUTTON_ON, BUTTON_NONE }, |
| 204 | 204 | ||
| 205 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 205 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
| 206 | 206 | ||
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index 45fb2ebfbb..82362ecedb 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c | |||
| @@ -89,8 +89,8 @@ static const struct button_mapping button_context_yesno[] = { | |||
| 89 | }; /* button_context_settings_yesno */ | 89 | }; /* button_context_settings_yesno */ |
| 90 | 90 | ||
| 91 | static const struct button_mapping button_context_bmark[] = { | 91 | static const struct button_mapping button_context_bmark[] = { |
| 92 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, | 92 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, |
| 93 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON }, | 93 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_NONE }, |
| 94 | 94 | ||
| 95 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 95 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
| 96 | }; /* button_context_settings_bmark */ | 96 | }; /* button_context_settings_bmark */ |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 040aed65ac..08c1213fa4 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
| @@ -201,8 +201,8 @@ static const struct button_mapping button_context_keyboard[] = { | |||
| 201 | }; /* button_context_keyboard */ | 201 | }; /* button_context_keyboard */ |
| 202 | 202 | ||
| 203 | static const struct button_mapping button_context_bmark[] = { | 203 | static const struct button_mapping button_context_bmark[] = { |
| 204 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, | 204 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, |
| 205 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON }, | 205 | { ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_NONE }, |
| 206 | 206 | ||
| 207 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 207 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
| 208 | 208 | ||