Merge branch 'layout-improvements' into 'main'

Update spanish and french terminal-layouts

See merge request World/Phosh/squeekboard!628
This commit is contained in:
Marge Bot
2024-03-18 15:51:10 +00:00
6 changed files with 178 additions and 101 deletions

View File

@ -1,6 +1,8 @@
---
outlines:
default: { width: 35.33, height: 46 }
halfwidth: { width: 17.665, height: 46 }
thin: { width: 30.995, height: 46 }
action: { width: 59, height: 46 }
altline: { width: 52.67, height: 46 }
large: { width: 52.67, height: 46 }
@ -13,33 +15,33 @@ views:
base:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "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"
- "show_numbers show_eschars preferences space show_actions Return"
upper:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
- "Q W E R T Y U I O P"
- "A S D F G H J K L Ñ"
- "Shift_L Z X C V B N M DelUp"
- "SlashSmall A S D F G H J K L PipeSmall"
- "Shift_L Z X C V B N M BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
numbers:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
- "* # / & - _ + ( )"
- "show_symbols , \" ' colon ; ! ? BackSpace"
- "\\ * # $ / & - + ( ) _"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space . Return"
symbols:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° @ { }"
- "show_numbers \\ % < > = [ ] BackSpace"
- "~ ` · √ π τ ÷ × @"
- "© ® £ ¥ ^ ° { }"
- "show_numbers % | < > = [ ] BackSpace"
- "show_letters show_eschars preferences space . Return"
eschars:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "á é í ó ú Á É Í Ó Ú"
- "à è ì ò ù À È Ì Ò Ù"
- "show_numbers , ü ç ï Ü Ç ï BackSpace"
- "show_letters show_symbols preferences space show_actions Return"
- "show_numbers ü ç ï ñ Ü Ç Ï Ñ BackSpace"
- "show_letters show_eschars preferences space show_actions Return"
actions:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
- "F1 F2 F3 F4 F5 F6"
@ -85,9 +87,11 @@ buttons:
label: "τ=\\"
show_eschars:
action:
set_view: "eschars"
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "altline"
label: "áÁ"
label: á"
show_actions:
action:
set_view: "actions"
@ -103,8 +107,6 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
colon:
text: ":"
F1:
outline: "action"
keysym: "F1"
@ -154,36 +156,38 @@ buttons:
Del:
outline: "action"
keysym: "Delete"
DelUp:
outline: "altline"
keysym: "Delete"
label: "Del"
label: "Supr"
Insert:
outline: "action"
keysym: "Insert"
Menu:
outline: "action"
keysym: "Menu"
label: "Menú"
Pause:
outline: "action"
keysym: "Pause"
label: "Pausa"
Break:
outline: "action"
keysym: "Break"
label: "Inter"
Home:
outline: "small"
keysym: "Home"
label: "Inicio"
End:
outline: "small"
keysym: "End"
label: "Fin"
PageUp:
outline: "small"
keysym: "Page_Up"
label: "Page ↑"
label: "Pág ↑"
PageDown:
outline: "small"
keysym: "Page_Down"
label: "Page ↓"
label: "Pág ↓"
"↑":
outline: "small"
keysym: "Up"
@ -220,3 +224,35 @@ buttons:
modifier: "Alt"
outline: "small"
label: "Alt"
ü:
outline: "thin"
ç:
outline: "thin"
ï:
outline: "thin"
ñ:
outline: "thin"
Ü:
outline: "thin"
Ç:
outline: "thin"
Ï:
outline: "thin"
Ñ:
outline: "thin"
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
PipeSmall:
outline: "halfwidth"
text: "|"
PeriodSmall:
outline: "halfwidth"
text: "."
"\\":
outline: "halfwidth"
_:
outline: "halfwidth"

View File

@ -1,6 +1,8 @@
---
outlines:
default: { width: 54, height: 37 }
halfwidth: { width: 27, height: 37 }
thin: { width: 47.25, height: 37 }
action: { width: 90, height: 37 }
altline: { width: 81, height: 37 }
large: { width: 81, height: 37 }
@ -13,33 +15,33 @@ views:
base:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "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"
- "show_numbers show_eschars preferences space show_actions Return"
upper:
- "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
- "Q W E R T Y U I O P"
- "A S D F G H J K L Ñ"
- "Shift_L Z X C V B N M DelUp"
- "SlashSmall A S D F G H J K L PipeSmall"
- "Shift_L Z X C V B N M BackSpace"
- "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_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space . Return"
symbols:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶"
- "© ® £ € ¥ ^ ° @ { }"
- "show_numbers \\ % < > = [ ] BackSpace"
- "~ ` · √ π τ ÷ × @"
- "© ® £ € ¥ ^ ° { }"
- "show_numbers % | < > = [ ] BackSpace"
- "show_letters show_eschars preferences space . Return"
eschars:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "á é í ó ú Á É Í Ó Ú"
- "à è ì ò ù À È Ì Ò Ù"
- "show_numbers ´ ü ç ï Ü Ç Ï BackSpace"
- "show_letters show_symbols preferences space 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"
@ -85,9 +87,11 @@ buttons:
label: "τ=\\"
show_eschars:
action:
set_view: "eschars"
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "altline"
label: "áÁ"
label: á"
show_actions:
action:
set_view: "actions"
@ -103,8 +107,6 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
colon:
text: ":"
F1:
outline: "action"
keysym: "F1"
@ -158,36 +160,38 @@ buttons:
Del:
outline: "action"
keysym: "Delete"
DelUp:
outline: "altline"
keysym: "Delete"
label: "Del"
label: "Supr"
Insert:
outline: "action"
keysym: "Insert"
Menu:
outline: "action"
keysym: "Menu"
label: "Menú"
Pause:
outline: "action"
keysym: "Pause"
label: "Pausa"
Break:
outline: "action"
keysym: "Break"
label: "Inter"
Home:
outline: "small"
keysym: "Home"
label: "Inicio"
End:
outline: "small"
keysym: "End"
label: "Fin"
PageUp:
outline: "small"
keysym: "Page_Up"
label: "Page ↑"
label: "Pág ↑"
PageDown:
outline: "small"
keysym: "Page_Down"
label: "Page ↓"
label: "Pág ↓"
"↑":
outline: "small"
keysym: "Up"
@ -224,3 +228,35 @@ buttons:
modifier: "Alt"
outline: "small"
label: "Alt"
ü:
outline: "thin"
ç:
outline: "thin"
ï:
outline: "thin"
ñ:
outline: "thin"
Ü:
outline: "thin"
Ç:
outline: "thin"
Ï:
outline: "thin"
Ñ:
outline: "thin"
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
PipeSmall:
outline: "halfwidth"
text: "|"
PeriodSmall:
outline: "halfwidth"
text: "."
"\\":
outline: "halfwidth"
_:
outline: "halfwidth"

View File

@ -15,32 +15,32 @@ views:
- "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 show_eschars preferences space slash show_actions Return"
- "Shift_L y x k q g h f . BackSpace"
- "show_numbers show_eschars preferences space SlashSmall show_actions Return"
upper:
- "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 minus BackSpace"
- "show_numbers show_eschars preferences space colon show_actions Return"
- "Shift_L Y X K Q G H F MinusSmall BackSpace"
- "show_numbers show_eschars preferences space ColonSmall show_actions Return"
numbers:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols , \" ' : ; ! ? period BackSpace"
- "show_letters show_eschars preferences space slash show_actions Return"
- "show_symbols , \" ' : ; ! ? . BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return"
symbols:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / < > = [ ] period BackSpace"
- "show_letters show_eschars preferences space slash show_actions Return"
- "show_numbers \\ / < > = [ ] . BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return"
eschars:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "à â ç é è ê î ô ù û"
- "À Â Ç É È Ê Î Ô Ù Û"
- "show_numbers æ œ ä ë ï ö ü period BackSpace"
- "show_letters show_eschars preferences space slash show_actions Return"
- "show_numbers æ œ ä ë ï ö ü . BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return"
actions:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
- "F1 F2 F3 F4 F5 F6"
@ -89,6 +89,7 @@ buttons:
Esc:
outline: "action"
keysym: "Escape"
label: "Echap"
Tab:
outline: "action"
keysym: "Tab"
@ -99,9 +100,11 @@ buttons:
Del:
outline: "action"
keysym: "Delete"
label: "Suppr"
Insert:
outline: "action"
keysym: "Insert"
label: "Inser"
Menu:
outline: "action"
keysym: "Menu"
@ -111,12 +114,15 @@ buttons:
Break:
outline: "action"
keysym: "Break"
label: "Attn"
Home:
outline: "small"
keysym: "Home"
label: "🡔"
End:
outline: "small"
keysym: "End"
label: "Fin"
PageUp:
outline: "small"
keysym: "Page_Up"
@ -161,12 +167,6 @@ buttons:
modifier: "Alt"
outline: "small"
label: "Alt"
period:
outline: "narrow"
text: "."
slash:
outline: "narrow"
text: "/"
show_actions:
action:
set_view: "actions"
@ -221,11 +221,14 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
colon:
ColonSmall:
outline: "narrow"
text: ":"
"\"":
keysym: "quotedbl"
minus:
MinusSmall:
outline: "narrow"
text: "-"
SlashSmall:
outline: "narrow"
text: "/"
.:
outline: "narrow"

View File

@ -16,14 +16,14 @@ views:
- "EscSmall 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 show_eschars preferences space slash show_actions Return"
- "Shift_L y x k q g h f . BackSpace"
- "show_numbers show_eschars preferences space SlashSmall 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 minus BackSpace"
- "show_numbers show_eschars preferences space colon show_actions Return"
- "Shift_L Y X K Q G H F MinusSmall BackSpace"
- "show_numbers show_eschars preferences space ColonSmall show_actions Return"
numbers:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
@ -90,10 +90,11 @@ buttons:
Esc:
outline: "action"
keysym: "Escape"
label: "Echap"
EscSmall:
outline: "small"
keysym: "Escape"
label: "Esc"
label: "Echap"
Tab:
outline: "action"
keysym: "Tab"
@ -104,9 +105,11 @@ buttons:
Del:
outline: "action"
keysym: "Delete"
label: "Suppr"
Insert:
outline: "action"
keysym: "Insert"
label: "Inser"
Menu:
outline: "action"
keysym: "Menu"
@ -116,12 +119,15 @@ buttons:
Break:
outline: "action"
keysym: "Break"
label: "Attn"
Home:
outline: "small"
keysym: "Home"
label: "🡔"
End:
outline: "small"
keysym: "End"
label: "Fin"
PageUp:
outline: "small"
keysym: "Page_Up"
@ -166,12 +172,6 @@ buttons:
modifier: "Alt"
outline: "small"
label: "Alt"
period:
outline: "halfwidth"
text: "."
slash:
outline: "halfwidth"
text: "/"
show_actions:
action:
set_view: "actions"
@ -226,11 +226,14 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
colon:
ColonSmall:
outline: "halfwidth"
text: ":"
"\"":
keysym: "quotedbl"
minus:
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
.:
outline: "halfwidth"

View File

@ -14,7 +14,7 @@ views:
- "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"
- "Shift_L w x c v b n . BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
upper:
- "TabSmall Ctrl Alt PageUp PageDown Home End"
@ -26,7 +26,7 @@ views:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols , \" ' colon ; ! ? BackSpace"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space show_actions Return"
symbols:
- "TabSmall Ctrl Alt ↑ ↓ ← →"
@ -88,6 +88,7 @@ buttons:
Esc:
outline: "action"
keysym: "Escape"
label: "Echap"
Tab:
outline: "action"
keysym: "Tab"
@ -98,9 +99,11 @@ buttons:
Del:
outline: "action"
keysym: "Delete"
label: "Suppr"
Insert:
outline: "action"
keysym: "Insert"
label: "Inser"
Menu:
outline: "action"
keysym: "Menu"
@ -110,12 +113,15 @@ buttons:
Break:
outline: "action"
keysym: "Break"
label: "Attn"
Home:
outline: "small"
keysym: "Home"
label: "🡔"
End:
outline: "small"
keysym: "End"
label: "Fin"
PageUp:
outline: "small"
keysym: "Page_Up"
@ -160,8 +166,6 @@ buttons:
modifier: "Alt"
outline: "small"
label: "Alt"
period:
text: "."
show_actions:
action:
set_view: "actions"
@ -216,7 +220,3 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
colon:
text: ":"
"\"":
keysym: "quotedbl"

View File

@ -14,7 +14,7 @@ views:
- "EscSmall 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"
- "Shift_L w x c v b n . BackSpace"
- "show_numbers show_eschars preferences space show_actions Return"
upper:
- "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
@ -26,7 +26,7 @@ views:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols , \" ' colon ; ! ? BackSpace"
- "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space show_actions Return"
symbols:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
@ -87,10 +87,11 @@ buttons:
Esc:
outline: "action"
keysym: "Escape"
label: "Echap"
EscSmall:
outline: "small"
keysym: "Escape"
label: "Esc"
label: "Echap"
Tab:
outline: "action"
keysym: "Tab"
@ -101,9 +102,11 @@ buttons:
Del:
outline: "action"
keysym: "Delete"
label: "Suppr"
Insert:
outline: "action"
keysym: "Insert"
label: "Inser"
Menu:
outline: "action"
keysym: "Menu"
@ -113,12 +116,15 @@ buttons:
Break:
outline: "action"
keysym: "Break"
label: "Attn"
Home:
outline: "small"
keysym: "Home"
label: "🡔"
End:
outline: "small"
keysym: "End"
label: "Fin"
PageUp:
outline: "small"
keysym: "Page_Up"
@ -163,9 +169,6 @@ buttons:
modifier: "Alt"
outline: "small"
label: "Alt"
period:
outline: "default"
text: "."
show_actions:
action:
set_view: "actions"
@ -220,7 +223,3 @@ buttons:
outline: "wide"
icon: "key-enter"
keysym: "Return"
colon:
text: ":"
"\"":
keysym: "quotedbl"