s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'improve-layouts-of-us-terminal-keyboards' into 'master'

Browse Source 
Improve the layouts of the us-terminal-keyboards

Closes #249 and #358

See merge request World/Phosh/squeekboard!601
This commit is contained in:
Marge Bot
2024-03-07 20:15:14 +00:00
parent 7117d1fe20 d299ba070d
commit b22cda800f
3 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data/keyboards/terminal/us+dvorak.yaml
View File

@ -1,40 +1,40 @@
--- ---
outlines: outlines:
default: { width: 35.33, height: 46 } default: { width: 35.33, height: 46 }
action: { width: 59, height: 46 } action: { width: 59, height: 46 }
altline: { width: 52.67, height: 46 } altline: { width: 52.67, height: 46 }
wide: { width: 59, height: 46 } wide: { width: 59, height: 46 }
spaceline: { width: 140, height: 46 } spaceline: { width: 140, height: 46 }
special: { width: 44, height: 46 } special: { width: 44, height: 46 }
small: { width: 59, height: 22 } small: { width: 50.47, height: 22 }
views: views:
base: base:
- "Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "Shift_L p y f g c r l BackSpace" - "Shift_L p y f g c r l BackSpace"
- "a o e u i d h t n s" - "a o e u i d h t n s"
- ", q j k x b m w v z" - ", q j k x b m w v z"
- "show_numbers preferences space show_actions Return" - "show_numbers preferences space show_actions Return"
upper: upper:
- "Ctrl Alt PgUp PgDn Home End" - "TabSmall Ctrl Alt PgUp PgDn Home End"
- "Shift_L P Y F G C R L BackSpace" - "Shift_L P Y F G C R L BackSpace"
- "A O E U I D H T N S" - "A O E U I D H T N S"
- ", Q J K X B M W V Z" - ", Q J K X B M W V Z"
- "show_numbers preferences space show_actions Return" - "show_numbers preferences space show_actions Return"
numbers: numbers:
- "Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "show_symbols , \" ' colon ; ! ? BackSpace" - "show_symbols , \" ' colon ; ! ? BackSpace"
- "* # $ / & - _ + ( )" - "* # $ / & - _ + ( )"
- "1 2 3 4 5 6 7 8 9 0" - "1 2 3 4 5 6 7 8 9 0"
- "show_letters preferences space period Return" - "show_letters preferences space period Return"
symbols: symbols:
- "Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "show_numbers_from_symbols \\ % < > = [ ] BackSpace" - "show_numbers_from_symbols \\ % < > = [ ] BackSpace"
- "© ® £ € ¥ ^ ° @ { }" - "© ® £ € ¥ ^ ° @ { }"
- "~ ` | · √ π τ ÷ × ¶" - "~ ` | · √ π τ ÷ × ¶"
- "show_letters preferences space period Return" - "show_letters preferences space period Return"
actions: actions:
- "Ctrl Alt PgUp PgDn Home End" - "TabSmall Ctrl Alt PgUp PgDn Home End"
- "F1 F2 F3 F4 F5 F6" - "F1 F2 F3 F4 F5 F6"
- "F7 F8 F9 F10 F11 F12" - "F7 F8 F9 F10 F11 F12"
- "Esc Tab Pause Insert Up Del" - "Esc Tab Pause Insert Up Del"
@ -135,6 +135,10 @@ buttons:
Tab: Tab:
outline: "action" outline: "action"
keysym: "Tab" keysym: "Tab"
TabSmall:
outline: "small"
keysym: "Tab"
label: "Tab"
Del: Del:
outline: "action" outline: "action"
keysym: "Delete" keysym: "Delete"

69
data/keyboards/terminal/us.yaml
View File

@ -1,44 +1,46 @@
--- ---
outlines: outlines:
default: { width: 35.33, height: 46 } default: { width: 35.33, height: 46 }
action: { width: 59, height: 46 } halfwidth: { width: 17.665, height: 46 }
altline: { width: 52.67, height: 46 } special: { width: 44, height: 46 }
wide: { width: 59, height: 46 } altline: { width: 52.67, height: 46 }
spaceline: { width: 140, height: 46 } large: { width: 52.67, height: 46 }
special: { width: 44, height: 46 } action: { width: 59, height: 46 }
small: { width: 59, height: 22 } wide: { width: 59, height: 46 }
spaceline: { width: 144.96, height: 46 }
small: { width: 50.57, height: 22 }
views: views:
base: base:
- "Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "q w e r t y u i o p" - "q w e r t y u i o p"
- "a s d f g h j k l" - "PeriodSmall a s d f g h j k l MinusSmall"
- "Shift_L z x c v b n m BackSpace" - "Shift_L z x c v b n m BackSpace"
- "show_numbers preferences space show_actions Return" - "show_numbers preferences space show_actions Return"
upper: upper:
- "Ctrl Alt PgUp PgDn Home End" - "TabSmall Ctrl Alt PgUp PgDn Home End"
- "Q W E R T Y U I O P" - "Q W E R T Y U I O P"
- "A S D F G H J K L" - "SlashSmall A S D F G H J K L PipeSmall"
- "Shift_L Z X C V B N M BackSpace" - "Shift_L Z X C V B N M BackSpace"
- "show_numbers preferences space show_actions Return" - "show_numbers preferences space show_actions Return"
numbers: numbers:
- "Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0" - "1 2 3 4 5 6 7 8 9 0"
- "* # $ / & - _ + ( )" - "\\ * # $ / & - + ( ) _"
- "show_symbols , \" ' colon ; ! ? BackSpace" - "show_symbols , \" ' colon ; ! ? BackSpace"
- "show_letters preferences space period Return" - "show_letters preferences space period Return"
symbols: symbols:
- "Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶" - "~ ` · √ π τ ÷ × @"
- "© ® £ € ¥ ^ ° @ { }" - "© ® £ € ¥ ^ ° { }"
- "show_numbers_from_symbols \\ % < > = [ ] BackSpace" - "show_numbers_from_symbols % | < > = [ ] BackSpace"
- "show_letters preferences space period Return" - "show_letters preferences space period Return"
actions: actions:
- "Ctrl Alt PgUp PgDn Home End" - "TabSmall Ctrl Alt PgUp PgDn Home End"
- "F1 F2 F3 F4 F5 F6" - "F1 F2 F3 F4 F5 F6"
- "F7 F8 F9 F10 F11 F12" - "F7 F8 F9 F10 F11 F12"
- "Esc Tab Pause Insert Up Del" - "Esc Tab Pause Insert Up Del"
- "show_letters Menu Break Left Down Right" - "show_letters_actions Menu Break Left Down Right"
buttons: buttons:
Shift_L: Shift_L:
@ -59,7 +61,7 @@ buttons:
show_numbers: show_numbers:
action: action:
set_view: "numbers" set_view: "numbers"
outline: "wide" outline: "altline"
label: "123" label: "123"
show_numbers_from_symbols: show_numbers_from_symbols:
action: action:
@ -67,6 +69,11 @@ buttons:
outline: "altline" outline: "altline"
label: "123" label: "123"
show_letters: show_letters:
action:
set_view: "base"
outline: "altline"
label: "ABC"
show_letters_actions:
action: action:
set_view: "base" set_view: "base"
outline: "wide" outline: "wide"
@ -82,7 +89,7 @@ buttons:
outline: "altline" outline: "altline"
label: ">_" label: ">_"
period: period:
outline: "altline" outline: "large"
text: "." text: "."
space: space:
outline: "spaceline" outline: "spaceline"
@ -135,6 +142,10 @@ buttons:
Tab: Tab:
outline: "action" outline: "action"
keysym: "Tab" keysym: "Tab"
TabSmall:
outline: "small"
keysym: "Tab"
label: "Tab"
Del: Del:
outline: "action" outline: "action"
keysym: "Delete" keysym: "Delete"
@ -198,3 +209,19 @@ buttons:
modifier: "Alt" modifier: "Alt"
outline: "small" outline: "small"
label: "Alt" label: "Alt"
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
PipeSmall:
outline: "halfwidth"
text: "|"
PeriodSmall:
outline: "halfwidth"
text: "."
"\\":
outline: "halfwidth"
_:
outline: "halfwidth"

51
data/keyboards/terminal/us_wide.yaml
View File

@ -1,44 +1,46 @@
--- ---
outlines: outlines:
default: { width: 54, height: 37 } default: { width: 54, height: 37 }
action: { width: 90, height: 37 } halfwidth: { width: 27, height: 37 }
altline: { width: 81, height: 37 }
wide: { width: 90, height: 37 }
spaceline: { width: 225, height: 37 }
special: { width: 54, 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: 234, height: 37 }
small: { width: 67.4, height: 22 } small: { width: 67.4, height: 22 }
views: views:
base: base:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "q w e r t y u i o p" - "q w e r t y u i o p"
- "a s d f g h j k l" - "PeriodSmall a s d f g h j k l MinusSmall"
- "Shift_L z x c v b n m BackSpace" - "Shift_L z x c v b n m BackSpace"
- "show_numbers preferences space show_actions Return" - "show_numbers preferences space show_actions Return"
upper: upper:
- "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End" - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
- "Q W E R T Y U I O P" - "Q W E R T Y U I O P"
- "A S D F G H J K L" - "SlashSmall A S D F G H J K L PipeSmall"
- "Shift_L Z X C V B N M BackSpace" - "Shift_L Z X C V B N M BackSpace"
- "show_numbers preferences space show_actions Return" - "show_numbers preferences space show_actions Return"
numbers: numbers:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0" - "1 2 3 4 5 6 7 8 9 0"
- "* # $ / & - _ + ( )" - "\\ * # $ / & - + ( ) _"
- "show_symbols , \" ' colon ; ! ? BackSpace" - "show_symbols , \" ' colon ; ! ? BackSpace"
- "show_letters preferences space period Return" - "show_letters preferences space period Return"
symbols: symbols:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶" - "~ ` · √ π τ ÷ × @"
- "© ® £ € ¥ ^ ° @ { }" - "© ® £ € ¥ ^ ° { }"
- "show_numbers_from_symbols \\ % < > = [ ] BackSpace" - "show_numbers_from_symbols % | < > = [ ] BackSpace"
- "show_letters preferences space period Return" - "show_letters preferences space period Return"
actions: actions:
- "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End" - "EscSmall TabSmall Ctrl Alt PgUp PgDn Home End"
- "F1 F2 F3 F4 F5 F6" - "F1 F2 F3 F4 F5 F6"
- "F7 F8 F9 F10 F11 F12" - "F7 F8 F9 F10 F11 F12"
- "Esc Tab Pause Insert Up Del" - "Esc Tab Pause Insert Up Del"
- "show_letters Menu Break Left Down Right" - "show_letters_actions Menu Break Left Down Right"
buttons: buttons:
Shift_L: Shift_L:
@ -59,7 +61,7 @@ buttons:
show_numbers: show_numbers:
action: action:
set_view: "numbers" set_view: "numbers"
outline: "wide" outline: "altline"
label: "123" label: "123"
show_numbers_from_symbols: show_numbers_from_symbols:
action: action:
@ -67,6 +69,11 @@ buttons:
outline: "altline" outline: "altline"
label: "123" label: "123"
show_letters: show_letters:
action:
set_view: "base"
outline: "altline"
label: "ABC"
show_letters_actions:
action: action:
set_view: "base" set_view: "base"
outline: "wide" outline: "wide"
@ -82,7 +89,7 @@ buttons:
outline: "altline" outline: "altline"
label: ">_" label: ">_"
period: period:
outline: "altline" outline: "large"
text: "." text: "."
space: space:
outline: "spaceline" outline: "spaceline"
@ -205,4 +212,20 @@ buttons:
Alt: Alt:
modifier: "Alt" modifier: "Alt"
outline: "small" outline: "small"
label: "Alt" label: "Alt"
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
PipeSmall:
outline: "halfwidth"
text: "|"
PeriodSmall:
outline: "halfwidth"
text: "."
"\\":
outline: "halfwidth"
_:
outline: "halfwidth"