diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2009-11-08 13:14:50 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2009-11-08 13:14:50 +0000 |
commit | 92fb1df03aa1d7cd33bb07f7222e36e954409e52 (patch) | |
tree | 79c471e6aceac1ca49ca98bdcb10b7f1b084119a /apps/keymaps | |
parent | b92e778fd71dfc86d41e6ddf68cf7b35477bc927 (diff) | |
download | rockbox-92fb1df03aa1d7cd33bb07f7222e36e954409e52.tar.gz rockbox-92fb1df03aa1d7cd33bb07f7222e36e954409e52.zip |
FS#10338: Add "use morse input " entry to settings menu
* Remember last used text input mode (keyboard or morse input) in settings.
* Add setting "Use Morse Code Input" under Settings -> General Settings -> System.
Now it is possible for some of targets without button combo for changing input mode to use morse input by changing the setting. it's not possible for them to change input mode during in the keyboard screen of course.
There are still targets without morse input mode.
Flyspray: FS#10338
Author: myself, David Johnston
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23567 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-creativezv.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-creativezvm.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-e200.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-fuze.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-m200.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-mr500.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 1 | ||||
-rw-r--r-- | apps/keymaps/keymap-x5.c | 3 |
8 files changed, 10 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c index c75a5b29cd..b88c1409cd 100644 --- a/apps/keymaps/keymap-creativezv.c +++ b/apps/keymaps/keymap-creativezv.c | |||
@@ -213,6 +213,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
213 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 213 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
214 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 214 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
215 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 215 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
216 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
216 | LAST_ITEM_IN_LIST | 217 | LAST_ITEM_IN_LIST |
217 | }; /* button_context_keyboard */ | 218 | }; /* button_context_keyboard */ |
218 | 219 | ||
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c index 12694bc473..b355018892 100644 --- a/apps/keymaps/keymap-creativezvm.c +++ b/apps/keymaps/keymap-creativezvm.c | |||
@@ -212,6 +212,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
212 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 212 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
213 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 213 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
214 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 214 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
215 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
215 | LAST_ITEM_IN_LIST | 216 | LAST_ITEM_IN_LIST |
216 | }; /* button_context_keyboard */ | 217 | }; /* button_context_keyboard */ |
217 | 218 | ||
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 487fb11130..2deac631ac 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -265,6 +265,8 @@ static const struct button_mapping button_context_keyboard[] = { | |||
265 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 265 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
266 | { ACTION_KBD_DONE, BUTTON_UP, BUTTON_NONE }, | 266 | { ACTION_KBD_DONE, BUTTON_UP, BUTTON_NONE }, |
267 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, | 267 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, |
268 | { ACTION_KBD_MORSE_INPUT, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
269 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
268 | 270 | ||
269 | LAST_ITEM_IN_LIST | 271 | LAST_ITEM_IN_LIST |
270 | }; /* button_context_keyboard */ | 272 | }; /* button_context_keyboard */ |
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c index e44ee518f2..3e89cc595f 100644 --- a/apps/keymaps/keymap-fuze.c +++ b/apps/keymaps/keymap-fuze.c | |||
@@ -266,6 +266,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
266 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 266 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
267 | { ACTION_KBD_DONE, BUTTON_UP, BUTTON_NONE }, | 267 | { ACTION_KBD_DONE, BUTTON_UP, BUTTON_NONE }, |
268 | { ACTION_KBD_ABORT, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, | 268 | { ACTION_KBD_ABORT, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, |
269 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
269 | 270 | ||
270 | LAST_ITEM_IN_LIST | 271 | LAST_ITEM_IN_LIST |
271 | }; /* button_context_keyboard */ | 272 | }; /* button_context_keyboard */ |
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c index 78a4947b2f..e3aa093a81 100644 --- a/apps/keymaps/keymap-m200.c +++ b/apps/keymaps/keymap-m200.c | |||
@@ -274,6 +274,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
274 | { ACTION_KBD_DONE, BUTTON_VOL_UP, BUTTON_NONE }, | 274 | { ACTION_KBD_DONE, BUTTON_VOL_UP, BUTTON_NONE }, |
275 | { ACTION_KBD_DONE, BUTTON_VOL_DOWN, BUTTON_NONE }, | 275 | { ACTION_KBD_DONE, BUTTON_VOL_DOWN, BUTTON_NONE }, |
276 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, | 276 | { ACTION_KBD_ABORT, BUTTON_POWER, BUTTON_NONE }, |
277 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
277 | 278 | ||
278 | LAST_ITEM_IN_LIST | 279 | LAST_ITEM_IN_LIST |
279 | }; /* button_context_keyboard */ | 280 | }; /* button_context_keyboard */ |
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c index 36ffea46de..0b1dc767f2 100644 --- a/apps/keymaps/keymap-mr500.c +++ b/apps/keymaps/keymap-mr500.c | |||
@@ -191,6 +191,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
191 | { ACTION_KBD_UP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 191 | { ACTION_KBD_UP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
192 | { ACTION_KBD_DOWN, BUTTON_RC_DOWN, BUTTON_NONE }, | 192 | { ACTION_KBD_DOWN, BUTTON_RC_DOWN, BUTTON_NONE }, |
193 | { ACTION_KBD_DOWN, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 193 | { ACTION_KBD_DOWN, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
194 | { ACTION_KBD_MORSE_SELECT, BUTTON_RC_HEART|BUTTON_REL, BUTTON_NONE }, | ||
194 | 195 | ||
195 | LAST_ITEM_IN_LIST | 196 | LAST_ITEM_IN_LIST |
196 | }; /* button_context_keyboard */ | 197 | }; /* button_context_keyboard */ |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 6c8ae0460e..0ab0e5f8c6 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -197,6 +197,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
197 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 197 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
198 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 198 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
199 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 199 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
200 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | ||
200 | 201 | ||
201 | LAST_ITEM_IN_LIST | 202 | LAST_ITEM_IN_LIST |
202 | }; /* button_context_keyboard */ | 203 | }; /* button_context_keyboard */ |
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 8b94118ac1..69602d7ca7 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -132,9 +132,10 @@ static const struct button_mapping button_context_keyboard[] = { | |||
132 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 132 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
133 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 133 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
134 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 134 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
135 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 135 | { ACTION_KBD_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
136 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, | 136 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, |
137 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | 137 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, |
138 | { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
138 | 139 | ||
139 | LAST_ITEM_IN_LIST | 140 | LAST_ITEM_IN_LIST |
140 | }; /* button_context_keyboard */ | 141 | }; /* button_context_keyboard */ |