From c4af2131fd5f43dd22f54e0536b14257e006fa11 Mon Sep 17 00:00:00 2001 From: MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org> Date: Fri, 15 Mar 2024 14:27:14 +0100 Subject: [PATCH] data/keyboards/terminal/*.yaml: Update terminal-layouts - Fix highlighting - Fix sizes of buttons - Reduce layout-changes when switching views - Make layouts more consistent Part-of: --- data/keyboards/terminal/de.yaml | 27 +++----- data/keyboards/terminal/de_wide.yaml | 7 +- data/keyboards/terminal/es.yaml | 16 ++--- data/keyboards/terminal/fr+bepo.yaml | 76 +++++++++++---------- data/keyboards/terminal/fr+bepo_wide.yaml | 55 ++++++++------- data/keyboards/terminal/fr.yaml | 60 ++++++++-------- data/keyboards/terminal/fr_wide.yaml | 37 +++++----- data/keyboards/terminal/us+dvorak.yaml | 31 +++++---- data/keyboards/terminal/us+dvorak_wide.yaml | 19 +++--- data/keyboards/terminal/us.yaml | 10 +-- data/keyboards/terminal/us_wide.yaml | 8 +-- 11 files changed, 172 insertions(+), 174 deletions(-) diff --git a/data/keyboards/terminal/de.yaml b/data/keyboards/terminal/de.yaml index f291fc75..224da6bc 100644 --- a/data/keyboards/terminal/de.yaml +++ b/data/keyboards/terminal/de.yaml @@ -1,15 +1,15 @@ --- outlines: - default: { width: 35.33, height: 46 } - halfwidth: { width: 17.665, height: 46 } - narrow: { width: 26.335, height: 46 } - special: { width: 35.33, height: 46 } - altline: { width: 52.67, height: 46 } - large: { width: 52.67, height: 46 } - action: { width: 59, height: 46 } - wide: { width: 59, height: 46 } - spaceline: { width: 100.96, height: 46 } - small: { width: 50.471, height: 22 } + default: { width: 35.33, height: 46 } + halfwidth: { width: 17.665, height: 46 } + narrow: { width: 26.335, height: 46 } + special: { width: 44, height: 46 } + altline: { width: 52.67, height: 46 } + large: { width: 52.67, height: 46 } + action: { width: 59, height: 46 } + wide: { width: 59, height: 46 } + spaceline: { width: 92.29, height: 46 } + small: { width: 50.471, height: 22 } views: base: @@ -34,7 +34,7 @@ views: - "TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` · √ π τ ÷ × ¶ @" - "© ® £ € ¥ ^ ° { }" - - "show_numbers_from_symbols % | < > = [ ] BackSpace" + - "show_numbers % | < > = [ ] BackSpace" - "show_letters show_eschars preferences space period Return" eschars: - "TabSmall Ctrl Alt ↑ ↓ ← →" @@ -70,11 +70,6 @@ buttons: set_view: "numbers" outline: "altline" label: "123" - show_numbers_from_symbols: - action: - set_view: "numbers" - outline: "altline" - label: "123" show_letters: action: set_view: "base" diff --git a/data/keyboards/terminal/de_wide.yaml b/data/keyboards/terminal/de_wide.yaml index 6ccda374..989e6d63 100644 --- a/data/keyboards/terminal/de_wide.yaml +++ b/data/keyboards/terminal/de_wide.yaml @@ -34,7 +34,7 @@ views: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` · √ π τ ÷ × ¶ @" - "© ® £ € ¥ ^ ° { }" - - "show_numbers_from_symbols % | < > = [ ] BackSpace" + - "show_numbers % | < > = [ ] BackSpace" - "show_letters show_eschars preferences space period Return" eschars: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" @@ -70,11 +70,6 @@ buttons: set_view: "numbers" outline: "altline" label: "123" - show_numbers_from_symbols: - action: - set_view: "numbers" - outline: "altline" - label: "123" show_letters: action: set_view: "base" diff --git a/data/keyboards/terminal/es.yaml b/data/keyboards/terminal/es.yaml index 7338fd8d..f2488409 100644 --- a/data/keyboards/terminal/es.yaml +++ b/data/keyboards/terminal/es.yaml @@ -1,13 +1,13 @@ --- outlines: - default: { width: 35.33, height: 46 } - action: { width: 59, height: 46 } - altline: { width: 52.67, height: 46 } - large: { width: 52.67, height: 46 } - wide: { width: 59, height: 46 } - spaceline: { width: 92.29, height: 46 } - special: { width: 44, height: 46 } - small: { width: 50.57, height: 22 } + default: { width: 35.33, height: 46 } + action: { width: 59, height: 46 } + altline: { width: 52.67, height: 46 } + large: { width: 52.67, height: 46 } + wide: { width: 59, height: 46 } + spaceline: { width: 92.29, height: 46 } + special: { width: 44, height: 46 } + small: { width: 50.471, height: 22 } views: base: diff --git a/data/keyboards/terminal/fr+bepo.yaml b/data/keyboards/terminal/fr+bepo.yaml index 1108a4e4..c3b927de 100644 --- a/data/keyboards/terminal/fr+bepo.yaml +++ b/data/keyboards/terminal/fr+bepo.yaml @@ -1,50 +1,52 @@ --- outlines: - action: { width: 59, height: 46 } - small: { width: 50, height: 22 } - default: { width: 35.33, height: 46 } - altline: { width: 35.33, height: 46 } - wide: { width: 50, height: 46 } - spaceline: { width: 110, height: 46 } - special: { width: 35.33, height: 46 } + default: { width: 35.33, height: 46 } + halfwidth: { width: 17.665, height: 46 } + action: { width: 59, height: 46 } + altline: { width: 42, height: 46 } + wide: { width: 50, height: 46 } + narrow: { width: 22.5, height: 46 } + spaceline: { width: 119.47, height: 46 } + special: { width: 35.33, height: 46 } + small: { width: 50.471, height: 22 } views: base: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "b é p o w v d l j z" - "a u i e c t s r n m" - "Shift_L y x k q g h f period BackSpace" - - "show_numbers preferences slash space show_eschars show_actions Return" + - "show_numbers show_eschars preferences space slash show_actions Return" upper: - - "Ctrl Alt Tabsmall PageUp PageDown Home End" + - "TabSmall Ctrl Alt PageUp PageDown Home End" - "B É P O W V D L J Z" - "A U I E C T S R N M" - - "Shift_L Y X K Q G H F - BackSpace" - - "show_numbers preferences space colon show_eschars show_actions Return" + - "Shift_L Y X K Q G H F minus BackSpace" + - "show_numbers show_eschars preferences space colon show_actions Return" numbers: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - - "show_symbols , \" ' colon ; ! ? BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_symbols , \" ' : ; ! ? period BackSpace" + - "show_letters show_eschars preferences space slash show_actions Return" symbols: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` | · √ π τ ÷ × ¶" - "© ® £ $ ¥ ^ ° * { }" - - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers \\ / < > = [ ] period BackSpace" + - "show_letters show_eschars preferences space slash show_actions Return" eschars: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "à â ç é è ê î ô ù û" - "À Â Ç É È Ê Î Ô Ù Û" - - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers æ œ ä ë ï ö ü period BackSpace" + - "show_letters show_eschars preferences space slash show_actions Return" actions: - - "Ctrl Alt PageUp PageDown Home End" + - "TabSmall Ctrl Alt PageUp PageDown Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: @@ -90,7 +92,7 @@ buttons: Tab: outline: "action" keysym: "Tab" - Tabsmall: + TabSmall: outline: "small" keysym: "Tab" label: "Tab" @@ -160,15 +162,15 @@ buttons: outline: "small" label: "Alt" period: - outline: "special" + outline: "narrow" text: "." slash: - outline: "special" + outline: "narrow" text: "/" show_actions: action: set_view: "actions" - outline: "special" + outline: "altline" label: ">_" Shift_L: action: @@ -188,14 +190,14 @@ buttons: show_numbers: action: set_view: "numbers" - outline: "wide" - label: "123" - show_numbers_from_symbols: - action: - set_view: "numbers" - outline: "wide" + outline: "altline" label: "123" show_letters: + action: + set_view: "base" + outline: "altline" + label: "ABC" + show_letters_actions: action: set_view: "base" outline: "wide" @@ -203,7 +205,7 @@ buttons: show_symbols: action: set_view: "symbols" - outline: "wide" + outline: "altline" label: "*/=" show_eschars: action: @@ -211,7 +213,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "altline" - label: "âÂ" + label: "Ââ" space: outline: "spaceline" text: " " @@ -220,6 +222,10 @@ buttons: icon: "key-enter" keysym: "Return" colon: + outline: "narrow" text: ":" "\"": keysym: "quotedbl" + minus: + outline: "narrow" + text: "-" diff --git a/data/keyboards/terminal/fr+bepo_wide.yaml b/data/keyboards/terminal/fr+bepo_wide.yaml index e2ff5e1e..1eb2a754 100644 --- a/data/keyboards/terminal/fr+bepo_wide.yaml +++ b/data/keyboards/terminal/fr+bepo_wide.yaml @@ -1,12 +1,15 @@ --- outlines: default: { width: 54, height: 37 } - action: { width: 90, height: 37 } - small: { width: 67.4, height: 22 } - altline: { width: 81, height: 37 } - wide: { width: 100, height: 37 } - spaceline: { width: 110, height: 37 } + halfwidth: { width: 27, height: 37 } + narrow: { width: 40.5, height: 37 } special: { width: 54, height: 37 } + altline: { width: 81, height: 37 } + large: { width: 81, height: 37 } + action: { width: 90, height: 37 } + wide: { width: 90, height: 37 } + spaceline: { width: 153, height: 37 } + small: { width: 67.4, height: 22 } views: base: @@ -14,37 +17,37 @@ views: - "b é p o w v d l j z" - "a u i e c t s r n m" - "Shift_L y x k q g h f period BackSpace" - - "show_numbers preferences space slash show_eschars show_actions Return" + - "show_numbers show_eschars preferences space slash show_actions Return" upper: - "EscSmall TabSmall Ctrl Alt PageUp PageDown ← →" - "B É P O W V D L J Z" - "A U I E C T S R N M" - - "Shift_L Y X K Q G H F - BackSpace" - - "show_numbers preferences space colon show_eschars show_actions Return" + - "Shift_L Y X K Q G H F minus BackSpace" + - "show_numbers show_eschars preferences space colon show_actions Return" numbers: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - - "show_symbols , \" ' colon ; ! ? BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_symbols , \" ' : ; ! ? BackSpace" + - "show_letters show_eschars preferences space show_actions Return" symbols: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` | · √ π τ ÷ × ¶" - "© ® £ $ ¥ ^ ° * { }" - - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers \\ / < > = [ ] BackSpace" + - "show_letters show_eschars preferences space show_actions Return" eschars: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "à â ç é è ê î ô ù û" - "À Â Ç É È Ê Î Ô Ù Û" - - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers æ œ ä ë ï ö ü BackSpace" + - "show_letters show_eschars preferences space show_actions Return" actions: - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: @@ -164,15 +167,15 @@ buttons: outline: "small" label: "Alt" period: - outline: "special" + outline: "halfwidth" text: "." slash: - outline: "special" + outline: "halfwidth" text: "/" show_actions: action: set_view: "actions" - outline: "special" + outline: "altline" label: ">_" Shift_L: action: @@ -190,16 +193,16 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - action: - set_view: "numbers" - outline: "wide" - label: "123" - show_numbers_from_symbols: action: set_view: "numbers" outline: "altline" label: "123" show_letters: + action: + set_view: "base" + outline: "altline" + label: "ABC" + show_letters_actions: action: set_view: "base" outline: "wide" @@ -215,7 +218,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "altline" - label: "âÂ" + label: "Ââ" space: outline: "spaceline" text: " " @@ -224,6 +227,10 @@ buttons: icon: "key-enter" keysym: "Return" colon: + outline: "halfwidth" text: ":" "\"": keysym: "quotedbl" + minus: + outline: "halfwidth" + text: "-" diff --git a/data/keyboards/terminal/fr.yaml b/data/keyboards/terminal/fr.yaml index 4e7ae745..1f299ed1 100644 --- a/data/keyboards/terminal/fr.yaml +++ b/data/keyboards/terminal/fr.yaml @@ -1,50 +1,51 @@ --- outlines: - action: { width: 59, height: 46 } - small: { width: 50, height: 22 } - default: { width: 35.33, height: 46 } - altline: { width: 48, height: 46 } - wide: { width: 50, height: 46 } - spaceline: { width: 110, height: 46 } - special: { width: 44, height: 46 } + default: { width: 35.33, height: 46 } + action: { width: 59, height: 46 } + small: { width: 50.471, height: 22 } + altline: { width: 52.67, height: 46 } + large: { width: 52.67, height: 46 } + wide: { width: 59, height: 46 } + spaceline: { width: 92.29, height: 46 } + special: { width: 44, height: 46 } views: base: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "a z e r t y u i o p" - "q s d f g h j k l m" - "Shift_L w x c v b n period BackSpace" - - "show_numbers preferences space show_eschars show_actions Return" + - "show_numbers show_eschars preferences space show_actions Return" upper: - - "Ctrl Alt Tabsmall PageUp PageDown Home End" + - "TabSmall Ctrl Alt PageUp PageDown Home End" - "A Z E R T Y U I O P" - "Q S D F G H J K L M" - "Shift_L W X C V B N , BackSpace" - - "show_numbers preferences space show_eschars show_actions Return" + - "show_numbers show_eschars preferences space show_actions Return" numbers: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - "show_symbols , \" ' colon ; ! ? BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_letters show_eschars preferences space show_actions Return" symbols: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` | · √ π τ ÷ × ¶" - "© ® £ $ ¥ ^ ° * { }" - - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers \\ / < > = [ ] BackSpace" + - "show_letters show_eschars preferences space show_actions Return" eschars: - - "Ctrl Alt Tabsmall ↑ ↓ ← →" + - "TabSmall Ctrl Alt ↑ ↓ ← →" - "à â ç é è ê î ô ù û" - "À Â Ç É È Ê Î Ô Ù Û" - - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers æ œ ä ë ï ö ü BackSpace" + - "show_letters show_eschars preferences space show_actions Return" actions: - - "Ctrl Alt PageUp PageDown Home End" + - "TabSmall Ctrl Alt PageUp PageDown Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: @@ -90,7 +91,7 @@ buttons: Tab: outline: "action" keysym: "Tab" - Tabsmall: + TabSmall: outline: "small" keysym: "Tab" label: "Tab" @@ -160,12 +161,11 @@ buttons: outline: "small" label: "Alt" period: - outline: "special" text: "." show_actions: action: set_view: "actions" - outline: "special" + outline: "altline" label: ">_" Shift_L: action: @@ -183,16 +183,16 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - action: - set_view: "numbers" - outline: "wide" - label: "123" - show_numbers_from_symbols: action: set_view: "numbers" outline: "altline" label: "123" show_letters: + action: + set_view: "base" + outline: "altline" + label: "ABC" + show_letters_actions: action: set_view: "base" outline: "wide" @@ -208,7 +208,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "altline" - label: "âÂ" + label: "Ââ" space: outline: "spaceline" text: " " diff --git a/data/keyboards/terminal/fr_wide.yaml b/data/keyboards/terminal/fr_wide.yaml index 4705f785..e2a6f268 100644 --- a/data/keyboards/terminal/fr_wide.yaml +++ b/data/keyboards/terminal/fr_wide.yaml @@ -4,8 +4,9 @@ outlines: action: { width: 90, height: 37 } small: { width: 67.4, height: 22 } altline: { width: 81, height: 37 } - wide: { width: 100, height: 37 } - spaceline: { width: 110, height: 37 } + large: { width: 81, height: 37 } + wide: { width: 90, height: 37 } + spaceline: { width: 153, height: 37 } special: { width: 54, height: 37 } views: @@ -14,37 +15,37 @@ views: - "a z e r t y u i o p" - "q s d f g h j k l m" - "Shift_L w x c v b n period BackSpace" - - "show_numbers preferences space show_eschars show_actions Return" + - "show_numbers show_eschars preferences space show_actions Return" upper: - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" - "A Z E R T Y U I O P" - "Q S D F G H J K L M" - "Shift_L W X C V B N , BackSpace" - - "show_numbers preferences space show_eschars show_actions Return" + - "show_numbers show_eschars preferences space show_actions Return" numbers: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "@ # € % & - _ + ( )" - "show_symbols , \" ' colon ; ! ? BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_letters show_eschars preferences space show_actions Return" symbols: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` | · √ π τ ÷ × ¶" - "© ® £ $ ¥ ^ ° * { }" - - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers \\ / < > = [ ] BackSpace" + - "show_letters show_eschars preferences space show_actions Return" eschars: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "à â ç é è ê î ô ù û" - "À Â Ç É È Ê Î Ô Ù Û" - - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" - - "show_letters preferences space show_eschars show_actions Return" + - "show_numbers æ œ ä ë ï ö ü BackSpace" + - "show_letters show_eschars preferences space show_actions Return" actions: - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: F1: @@ -163,12 +164,12 @@ buttons: outline: "small" label: "Alt" period: - outline: "special" + outline: "default" text: "." show_actions: action: set_view: "actions" - outline: "special" + outline: "altline" label: ">_" Shift_L: action: @@ -186,16 +187,16 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - action: - set_view: "numbers" - outline: "wide" - label: "123" - show_numbers_from_symbols: action: set_view: "numbers" outline: "altline" label: "123" show_letters: + action: + set_view: "base" + outline: "altline" + label: "ABC" + show_letters_actions: action: set_view: "base" outline: "wide" @@ -211,7 +212,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "altline" - label: "âÂ" + label: "Ââ" space: outline: "spaceline" text: " " diff --git a/data/keyboards/terminal/us+dvorak.yaml b/data/keyboards/terminal/us+dvorak.yaml index cb355b7e..e529dd53 100644 --- a/data/keyboards/terminal/us+dvorak.yaml +++ b/data/keyboards/terminal/us+dvorak.yaml @@ -1,12 +1,13 @@ --- outlines: - default: { width: 35.33, height: 46 } - action: { width: 59, height: 46 } - altline: { width: 52.67, height: 46 } - wide: { width: 59, height: 46 } - spaceline: { width: 140, height: 46 } - special: { width: 44, height: 46 } - small: { width: 50.47, height: 22 } + default: { width: 35.33, height: 46 } + action: { width: 59, height: 46 } + altline: { width: 52.67, height: 46 } + large: { width: 52.67, height: 46 } + wide: { width: 59, height: 46 } + spaceline: { width: 144.96, height: 46 } + special: { width: 44, height: 46 } + small: { width: 50.471, height: 22 } views: base: @@ -29,7 +30,7 @@ views: - "show_letters preferences space period Return" symbols: - "TabSmall Ctrl Alt ↑ ↓ ← →" - - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" + - "show_numbers \\ % < > = [ ] BackSpace" - "© ® £ € ¥ ^ ° @ { }" - "~ ` | · √ π τ ÷ × ¶" - "show_letters preferences space period Return" @@ -38,7 +39,7 @@ views: - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: Shift_L: @@ -57,16 +58,16 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - action: - set_view: "numbers" - outline: "wide" - label: "123" - show_numbers_from_symbols: action: set_view: "numbers" outline: "altline" label: "123" show_letters: + action: + set_view: "base" + outline: "altline" + label: "ABC" + show_letters_actions: action: set_view: "base" outline: "wide" @@ -82,7 +83,7 @@ buttons: outline: "altline" label: ">_" period: - outline: "altline" + outline: "large" text: "." space: outline: "spaceline" diff --git a/data/keyboards/terminal/us+dvorak_wide.yaml b/data/keyboards/terminal/us+dvorak_wide.yaml index b3148d36..6a40c045 100644 --- a/data/keyboards/terminal/us+dvorak_wide.yaml +++ b/data/keyboards/terminal/us+dvorak_wide.yaml @@ -3,8 +3,9 @@ outlines: default: { width: 54, height: 37 } action: { width: 90, height: 37 } altline: { width: 81, height: 37 } + large: { width: 81, height: 37 } wide: { width: 90, height: 37 } - spaceline: { width: 225, height: 37 } + spaceline: { width: 234, height: 37 } special: { width: 54, height: 37 } small: { width: 67.4, height: 22 } @@ -29,7 +30,7 @@ views: - "show_letters preferences space period Return" symbols: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - - "show_numbers_from_symbols \\ % < > = [ ] BackSpace" + - "show_numbers \\ % < > = [ ] BackSpace" - "© ® £ € ¥ ^ ° @ { }" - "~ ` | · √ π τ ÷ × ¶" - "show_letters preferences space period Return" @@ -38,7 +39,7 @@ views: - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: Shift_L: @@ -57,16 +58,16 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - action: - set_view: "numbers" - outline: "wide" - label: "123" - show_numbers_from_symbols: action: set_view: "numbers" outline: "altline" label: "123" show_letters: + action: + set_view: "base" + outline: "altline" + label: "ABC" + show_letters_actions: action: set_view: "base" outline: "wide" @@ -82,7 +83,7 @@ buttons: outline: "altline" label: ">_" period: - outline: "altline" + outline: "large" text: "." space: outline: "spaceline" diff --git a/data/keyboards/terminal/us.yaml b/data/keyboards/terminal/us.yaml index 751eb728..75654a69 100644 --- a/data/keyboards/terminal/us.yaml +++ b/data/keyboards/terminal/us.yaml @@ -2,13 +2,14 @@ outlines: default: { width: 35.33, height: 46 } halfwidth: { width: 17.665, height: 46 } + narrow: { width: 26.335, height: 46 } special: { width: 44, height: 46 } altline: { width: 52.67, height: 46 } large: { width: 52.67, height: 46 } action: { width: 59, height: 46 } wide: { width: 59, height: 46 } spaceline: { width: 144.96, height: 46 } - small: { width: 50.57, height: 22 } + small: { width: 50.471, height: 22 } views: base: @@ -33,7 +34,7 @@ views: - "TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` · √ π τ ÷ × ¶ @" - "© ® £ € ¥ ^ ° { }" - - "show_numbers_from_symbols % | < > = [ ] BackSpace" + - "show_numbers % | < > = [ ] BackSpace" - "show_letters preferences space period Return" actions: - "TabSmall Ctrl Alt PageUp PageDown Home End" @@ -63,11 +64,6 @@ buttons: set_view: "numbers" outline: "altline" label: "123" - show_numbers_from_symbols: - action: - set_view: "numbers" - outline: "altline" - label: "123" show_letters: action: set_view: "base" diff --git a/data/keyboards/terminal/us_wide.yaml b/data/keyboards/terminal/us_wide.yaml index 9099e44c..913ac146 100644 --- a/data/keyboards/terminal/us_wide.yaml +++ b/data/keyboards/terminal/us_wide.yaml @@ -2,6 +2,7 @@ outlines: default: { width: 54, height: 37 } halfwidth: { width: 27, height: 37 } + narrow: { width: 40.5, height: 37 } special: { width: 54, height: 37 } altline: { width: 81, height: 37 } large: { width: 81, height: 37 } @@ -33,7 +34,7 @@ views: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` · √ π τ ÷ × ¶ @" - "© ® £ € ¥ ^ ° { }" - - "show_numbers_from_symbols % | < > = [ ] BackSpace" + - "show_numbers % | < > = [ ] BackSpace" - "show_letters preferences space period Return" actions: - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" @@ -63,11 +64,6 @@ buttons: set_view: "numbers" outline: "altline" label: "123" - show_numbers_from_symbols: - action: - set_view: "numbers" - outline: "altline" - label: "123" show_letters: action: set_view: "base"