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

Merge branch 'make-fr+bepo-terminal-layout-available' into 'main'

Browse Source 
layouts: Adjust French (fr+bepo) terminal-layout and make it available

See merge request World/Phosh/squeekboard!683
This commit is contained in:
Marge Bot
2024-09-29 09:01:41 +00:00
parent e89ba89aea 76194dba15
commit 0552b9cd3b
4 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
data/keyboards/terminal/fr+bepo.yaml
View File

@ -2,47 +2,47 @@
--- ---
outlines: outlines:
default: { width: 35.33, height: 45.5 } default: { width: 35.33, height: 45.5 }
halfwidth: { width: 17.665, height: 45.5 }
narrow: { width: 22.5, height: 45.5 }
special: { width: 35.33, height: 45.5 }
change-view: { width: 42, height: 45.5 }
change-view-2: { width: 50, height: 45.5 }
action: { width: 59, height: 45.5 } action: { width: 59, height: 45.5 }
wide: { width: 50, height: 45.5 }
spaceline: { width: 119.47, height: 45.5 }
small: { width: 50.471, height: 24 } small: { width: 50.471, height: 24 }
altline: { width: 52.67, height: 45.5 }
change-view: { width: 52.67, height: 45.5 }
large: { width: 52.67, height: 45.5 }
wide: { width: 59, height: 45.5 }
change-view-2: { width: 59, height: 45.5 }
spaceline: { width: 100.96, height: 45.5 }
special: { width: 35.33, height: 45.5 }
views: views:
base: base:
- "TabSmall Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "b é p o w v d l j z" - "b é p o w v d l j z"
- "a u i e c t s r n m" - "a u i e c t s r n m"
- "Shift_L y x k q g h f . BackSpace" - "Shift_L y x k q g h f BackSpace"
- "show_numbers show_eschars preferences space SlashSmall show_actions Return" - "show_numbers show_eschars preferences space show_actions Return"
upper: upper:
- "TabSmall Ctrl Alt PageUp PageDown Home End" - "TabSmall Ctrl Alt PageUp PageDown Home End"
- "B É P O W V D L J Z" - "B É P O W V D L J Z"
- "A U I E C T S R N M" - "A U I E C T S R N M"
- "Shift_L Y X K Q G H F MinusSmall BackSpace" - "Shift_L Y X K Q G H F BackSpace"
- "show_numbers show_eschars preferences space ColonSmall show_actions Return" - "show_numbers show_eschars preferences space show_actions Return"
numbers: numbers:
- "TabSmall 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 , \" ' : ; ! ? . BackSpace" - "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return" - "show_letters show_eschars preferences space . Return"
symbols: symbols:
- "TabSmall Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶" - "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }" - "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / < > = [ ] . BackSpace" - "show_numbers \\ / < > = [ ] BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return" - "show_letters show_eschars preferences space . Return"
eschars: eschars:
- "TabSmall Ctrl Alt ↑ ↓ ← →" - "TabSmall Ctrl Alt ↑ ↓ ← →"
- "à â ç é è ê î ô ù û" - "à â ç é è ê î ô ù û"
- "À Â Ç É È Ê Î Ô Ù Û" - "À Â Ç É È Ê Î Ô Ù Û"
- "show_numbers æ œ ä ë ï ö ü . BackSpace" - "show_numbers æ œ ä ë ï ö ü BackSpace"
- "show_letters show_eschars preferences space SlashSmall show_actions Return" - "show_letters show_eschars preferences space . Return"
actions: actions:
- "TabSmall Ctrl Alt PageUp PageDown Home End" - "TabSmall Ctrl Alt PageUp PageDown Home End"
- "F1 F2 F3 F4 F5 F6" - "F1 F2 F3 F4 F5 F6"
@ -223,14 +223,5 @@ buttons:
outline: "wide" outline: "wide"
icon: "key-enter" icon: "key-enter"
keysym: "Return" keysym: "Return"
ColonSmall:
outline: "narrow"
text: ":"
MinusSmall:
outline: "narrow"
text: "-"
SlashSmall:
outline: "narrow"
text: "/"
.: .:
outline: "narrow" outline: "large"

37
data/keyboards/terminal/fr+bepo_wide.yaml
View File

@ -2,48 +2,47 @@
--- ---
outlines: outlines:
default: { width: 54, height: 37 } default: { width: 54, height: 37 }
halfwidth: { width: 27, height: 37 } action: { width: 90, height: 37 }
narrow: { width: 40.5, height: 37 } small: { width: 67.4, height: 22 }
special: { width: 54, height: 37 } altline: { width: 81, height: 37 }
change-view: { width: 81, height: 37 } change-view: { width: 81, height: 37 }
large: { width: 81, height: 37 } large: { width: 81, height: 37 }
action: { width: 90, height: 37 }
wide: { width: 90, height: 37 } wide: { width: 90, height: 37 }
change-view-2: { width: 90, height: 37 } change-view-2: { width: 90, height: 37 }
spaceline: { width: 153, height: 37 } spaceline: { width: 153, height: 37 }
small: { width: 67.4, height: 22 } special: { width: 54, height: 37 }
views: views:
base: base:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "b é p o w v d l j z" - "b é p o w v d l j z"
- "a u i e c t s r n m" - "a u i e c t s r n m"
- "Shift_L y x k q g h f . BackSpace" - "Shift_L y x k q g h f BackSpace"
- "show_numbers show_eschars preferences space SlashSmall show_actions Return" - "show_numbers show_eschars preferences space show_actions Return"
upper: upper:
- "EscSmall TabSmall Ctrl Alt PageUp PageDown ← →" - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
- "B É P O W V D L J Z" - "B É P O W V D L J Z"
- "A U I E C T S R N M" - "A U I E C T S R N M"
- "Shift_L Y X K Q G H F MinusSmall BackSpace" - "Shift_L Y X K Q G H F BackSpace"
- "show_numbers show_eschars preferences space ColonSmall show_actions Return" - "show_numbers show_eschars 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 , \" ' : ; ! ? BackSpace" - "show_symbols , \" ' : ; ! ? BackSpace"
- "show_letters show_eschars preferences space show_actions Return" - "show_letters show_eschars preferences space . Return"
symbols: symbols:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "~ ` | · √ π τ ÷ × ¶" - "~ ` | · √ π τ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }" - "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / < > = [ ] BackSpace" - "show_numbers \\ / < > = [ ] BackSpace"
- "show_letters show_eschars preferences space show_actions Return" - "show_letters show_eschars preferences space . Return"
eschars: eschars:
- "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →"
- "à â ç é è ê î ô ù û" - "à â ç é è ê î ô ù û"
- "À Â Ç É È Ê Î Ô Ù Û" - "À Â Ç É È Ê Î Ô Ù Û"
- "show_numbers æ œ ä ë ï ö ü BackSpace" - "show_numbers æ œ ä ë ï ö ü BackSpace"
- "show_letters show_eschars preferences space show_actions Return" - "show_letters show_eschars preferences space . Return"
actions: actions:
- "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End"
- "F1 F2 F3 F4 F5 F6" - "F1 F2 F3 F4 F5 F6"
@ -51,7 +50,6 @@ views:
- "Esc Tab Pause Insert Up Del" - "Esc Tab Pause Insert Up Del"
- "show_letters_actions Menu Break Left Down Right" - "show_letters_actions Menu Break Left Down Right"
buttons: buttons:
F1: F1:
outline: "action" outline: "action"
@ -228,14 +226,5 @@ buttons:
outline: "wide" outline: "wide"
icon: "key-enter" icon: "key-enter"
keysym: "Return" keysym: "Return"
ColonSmall:
outline: "halfwidth"
text: ":"
MinusSmall:
outline: "halfwidth"
text: "-"
SlashSmall:
outline: "halfwidth"
text: "/"
.: .:
outline: "halfwidth" outline: "large"

2
src/resources.rs
View File

@ -173,6 +173,8 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
("terminal/fr", include_str!("../data/keyboards/terminal/fr.yaml")), ("terminal/fr", include_str!("../data/keyboards/terminal/fr.yaml")),
("terminal/fr_wide", include_str!("../data/keyboards/terminal/fr_wide.yaml")), ("terminal/fr_wide", include_str!("../data/keyboards/terminal/fr_wide.yaml")),
("terminal/fr+bepo", include_str!("../data/keyboards/terminal/fr+bepo.yaml")),
("terminal/fr+bepo_wide", include_str!("../data/keyboards/terminal/fr+bepo_wide.yaml")),
("terminal/us", include_str!("../data/keyboards/terminal/us.yaml")), ("terminal/us", include_str!("../data/keyboards/terminal/us.yaml")),
("terminal/us_wide", include_str!("../data/keyboards/terminal/us_wide.yaml")), ("terminal/us_wide", include_str!("../data/keyboards/terminal/us_wide.yaml")),

1
tests/meson.build
View File

@ -114,6 +114,7 @@ foreach layout : [
'terminal/de', 'terminal/de_wide', 'terminal/de', 'terminal/de_wide',
'terminal/es', 'terminal/es_wide', 'terminal/es', 'terminal/es_wide',
'terminal/fr', 'terminal/fr_wide', 'terminal/fr', 'terminal/fr_wide',
'terminal/fr+bepo', 'terminal/fr+bepo_wide',
'terminal/us', 'terminal/us_wide', 'terminal/us', 'terminal/us_wide',
'terminal/us+dvorak', 'terminal/us+dvorak_wide', 'terminal/us+dvorak', 'terminal/us+dvorak_wide',