diff options
| author | Paul Louden <paulthenerd@gmail.com> | 2007-11-20 01:59:06 +0000 |
|---|---|---|
| committer | Paul Louden <paulthenerd@gmail.com> | 2007-11-20 01:59:06 +0000 |
| commit | 92b6ee91fa5ac6c6d73c9739f0b6d249c52951e0 (patch) | |
| tree | 820d5e369b02b8483c71944473facd810c39829b | |
| parent | 9873d33bf535923265b07163785bd73d3b2759b3 (diff) | |
| download | rockbox-92b6ee91fa5ac6c6d73c9739f0b6d249c52951e0.zip rockbox-92b6ee91fa5ac6c6d73c9739f0b6d249c52951e0.tar.gz rockbox-92b6ee91fa5ac6c6d73c9739f0b6d249c52951e0.tar.bz2 rockbox-92b6ee91fa5ac6c6d73c9739f0b6d249c52951e0.tar.xz | |
Fix keymapping inconsistencies generated by my previous keymap change,
this touches the FM Radio, Recording, and Text Editors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15706 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/keymaps/keymap-e200.c | 10 | ||||
| -rw-r--r-- | apps/plugins/text_editor.c | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index dd457a8..20c744e 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c @@ -209,7 +209,7 @@ static const struct button_mapping button_context_recscreen[] = { { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, - { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, @@ -224,11 +224,11 @@ static const struct button_mapping button_context_recscreen[] = { /** FM Radio Screen **/ static const struct button_mapping button_context_radio[] = { - { ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE }, - { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, - { ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, + { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_FM_PRESET, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, + { ACTION_FM_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_UP }, { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, - { ACTION_FM_EXIT, BUTTON_POWER, BUTTON_NONE }, + { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) }; /* button_context_radio */ diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index 6b6e449..c08bca8 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c @@ -459,6 +459,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) } } break; + case ACTION_STD_STOP: case ACTION_STD_CANCEL: if (changed) { |