From 53c5161f8f848081b59b9d2489dce98ad5108dfd Mon Sep 17 00:00:00 2001 From: MeexReay Date: Tue, 23 Sep 2025 02:48:23 +0300 Subject: [PATCH] rewrite terminal/us.yaml --- terminal/us.yaml | 163 ++++++++++++++++++++--------------------------- 1 file changed, 68 insertions(+), 95 deletions(-) diff --git a/terminal/us.yaml b/terminal/us.yaml index fd4b070..9c69f29 100644 --- a/terminal/us.yaml +++ b/terminal/us.yaml @@ -1,90 +1,60 @@ --- outlines: - default: { width: 35.33, height: 46 } - lil: { width: 17, height: 46 } - action: { width: 59, height: 46 } - action2: { width: 59, height: 57.5 } - altline: { width: 52.67, height: 46 } - altline2: { width: 35.67, height: 46 } - wide: { width: 59, height: 46 } - wide2: { width: 59, height: 57.5 } - spaceline: { width: 140, height: 46 } - special: { width: 44, height: 46 } - small: { width: 39, height: 28 } + default: { width: 35.33, height: 46 } + halfwidth: { width: 17.665, height: 46 } + special: { width: 44, height: 46 } + altline: { width: 52.67, height: 46 } + large: { width: 52.67, height: 46 } + action: { width: 59, height: 57.5 } + wide: { width: 59, height: 46 } + spaceline: { width: 144.96, height: 46 } + small: { width: 44.24, height: 22 } views: base: - - "TabSmall Escape Shift Ctrl Alt ↑ ↓ ← →" + - "EscapeSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - "q w e r t y u i o p" - - "onethinglil a s d f g h j k l twothingslil" - - "Shift_L onelongthinglil z x c v b n m slash BackSpace" + - "SlashSmall a s d f g h j k l PeriodSmall" + - "Shift_L z x c v b n m BackSpace" - "show_numbers preferences space show_actions Return" upper: - - "TabSmall Escape Shift Ctrl Alt PgUp PgDn Home End" + - "EscapeSmall TabSmall Ctrl Alt PgUp PgDn Home End" - "1 2 3 4 5 6 7 8 9 0" - "Q W E R T Y U I O P" - - "onethinglil A S D F G H J K L twothingslil2" - - "Shift_L onelongthinglil Z X C V B N M backslash BackSpace" + - "SlashSmall A S D F G H J K L PeriodSmall" + - "Shift_L Z X C V B N M BackSpace" - "show_numbers preferences space show_actions Return" numbers: - - "TabSmall Escape Shift Ctrl Alt ↑ ↓ ← →" + - "EscapeSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - - "* # $ / & - _ + ( )" - - "© ® £ € ¥ ^ ° @ { }" - - "show_symbols , \" ' colon ; ! ? BackSpace2" + - "* # $ \\ / - + ( ) _" + - "© ® £ € ¥ ^ ° { } &" + - "show_symbols , \" ' colon ; ! ? BackSpace" - "show_letters preferences space period Return" symbols: - - "TabSmall Escape Shift Ctrl Alt ↑ ↓ ← →" + - "EscapeSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "1 2 3 4 5 6 7 8 9 0" - - "~ ` | · √ π τ ÷ × ¶" - - "© ® £ € ¥ ^ ° @ { }" - - "show_numbers_from_symbols \\ % < > = [ ] BackSpace2" + - "~ ` · √ π τ ÷ × ¶ @" + - "© ® £ € ¥ ^ ° { } &" + - "show_numbers_from_symbols % | < > = [ ] BackSpace" - "show_letters preferences space period Return" actions: - - "TabSmall Escape Shift Ctrl Alt PgUp PgDn Home End" + - "EscapeSmall TabSmall Ctrl Alt PgUp PgDn Home End" - "F1 F2 F3 F4 F5 F6" - "F7 F8 F9 F10 F11 F12" - "Esc Tab Pause Insert Up Del" - - "show_letters2 Menu Break Left Down Right" + - "show_letters_actions Menu Break Left Down Right" buttons: - "onethinglil": - outline: lil - label: "." - text: "." - "slash": - outline: lil - label: "/" - text: "/" - "backslash": - outline: lil - label: "\\" - text: "\\" - "twothingslil": - outline: lil - label: ":" - text: ":" - "twothingslil2": - outline: lil - label: ":" - text: ":" - "onelongthinglil": - outline: lil - label: "!" - text: "!" Shift_L: action: locking: lock_view: "upper" unlock_view: "base" - outline: "altline2" + outline: "altline" icon: "key-shift" BackSpace: - outline: "altline2" - icon: "edit-clear-symbolic" - action: erase - BackSpace2: outline: "altline" icon: "edit-clear-symbolic" action: erase @@ -95,7 +65,7 @@ buttons: show_numbers: action: set_view: "numbers" - outline: "wide" + outline: "altline" label: "123" show_numbers_from_symbols: action: @@ -105,25 +75,25 @@ buttons: show_letters: action: set_view: "base" - outline: "wide" + outline: "altline" label: "ABC" - show_letters2: + show_letters_actions: action: set_view: "base" - outline: "wide2" + outline: "wide" label: "ABC" show_symbols: action: set_view: "symbols" outline: "altline" - label: "τ=\\" + label: "*/=" show_actions: action: set_view: "actions" outline: "altline" label: ">_" period: - outline: "altline" + outline: "large" text: "." space: outline: "spaceline" @@ -135,68 +105,69 @@ buttons: colon: text: ":" F1: - outline: "action2" + outline: "action" keysym: "F1" F2: - outline: "action2" + outline: "action" keysym: "F2" F3: - outline: "action2" + outline: "action" keysym: "F3" F4: - outline: "action2" + outline: "action" keysym: "F4" F5: - outline: "action2" + outline: "action" keysym: "F5" F6: - outline: "action2" + outline: "action" keysym: "F6" F7: - outline: "action2" + outline: "action" keysym: "F7" F8: - outline: "action2" + outline: "action" keysym: "F8" F9: - outline: "action2" + outline: "action" keysym: "F9" F10: - outline: "action2" + outline: "action" keysym: "F10" F11: - outline: "action2" + outline: "action" keysym: "F11" F12: - outline: "action2" + outline: "action" keysym: "F12" Esc: - outline: "action2" - keysym: "Escape" - Escape: - outline: "small" + outline: "action" keysym: "Escape" + Tab: + outline: "action" + keysym: "Tab" TabSmall: outline: "small" keysym: "Tab" - label: Tab - Tab: - outline: "action2" - keysym: "Tab" + label: "Tab" + EscapeSmall: + outline: "small" + keysym: "Escape" + label: "Escape" Del: - outline: "action2" + outline: "action" keysym: "Delete" Insert: - outline: "action2" + outline: "action" keysym: "Insert" Menu: - outline: "action2" + outline: "action" keysym: "Menu" Pause: - outline: "action2" + outline: "action" keysym: "Pause" Break: - outline: "action2" + outline: "action" keysym: "Break" Home: outline: "small" @@ -224,29 +195,31 @@ buttons: keysym: "Right" Up: label: "↑" - outline: "action2" + outline: "action" keysym: "Up" Left: label: "←" - outline: "action2" + outline: "action" keysym: "Left" Down: label: "↓" - outline: "action2" + outline: "action" keysym: "Down" Right: label: "→" - outline: "action2" + outline: "action" keysym: "Right" Ctrl: modifier: "Control" outline: "small" label: "Ctrl" - Shift: - modifier: "Shift" - outline: "small" - label: "Shift" Alt: modifier: "Alt" outline: "small" label: "Alt" + SlashSmall: + outline: "halfwidth" + text: "/" + PeriodSmall: + outline: "halfwidth" + text: "."