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

Merge branch 'add-ergonomic-de-layouts' into 'main'

Browse Source 
Layouts: Add ergonomic German layouts

See merge request World/Phosh/squeekboard!658
This commit is contained in:
Marge Bot
2024-08-08 20:39:24 +00:00
parent ed03b241b5 a905d03fc9
commit 0b83eb7d9f
6 changed files with 497 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
data/keyboards/de+bone.yaml Normal file
View File

@ -0,0 +1,121 @@
---
outlines:
default: { width: 32.12, height: 52 }
subtle-highlight: { width: 32.12, height: 52 }
special: { width: 32.12, height: 52 }
altline: { width: 48.17, height: 52 }
change-view: { width: 48.17, height: 52 }
fill: { width: 64.24, height: 52 }
subtle-highlight-2: { width: 64.24, height: 52 }
spaceline: { width: 112.45, height: 52 }
views:
base:
- "j d u a x p h l m w ß"
- "c t i e o b n r s g q"
- "Shift_L f v ü ä ö y z k BackSpace"
- "show_numbers show_eschars preferences space , . Return"
upper:
- "J D U A X P H L M W ẞ"
- "C T I E O B N R S G Q"
- "Shift_L F V Ü Ä Ö Y Z K BackSpace"
- "show_numbers show_eschars preferences space ! ? Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols ; \" ' : = < > BackSpace"
- "show_letters show_eschars preferences space , . Return"
symbols:
- "~ ` ´ | · √ µ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / § π τ [ ] BackSpace"
- "show_letters show_eschars preferences space , . Return"
eschars:
- "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
- "à â ê î ô À Â Ê Î Ô"
- "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
- "show_letters show_eschars preferences space „ “ Return"
buttons:
Shift_L:
action:
locking:
lock_view: "upper"
unlock_view: "base"
outline: "change-view"
icon: "key-shift"
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
set_view: "numbers"
outline: "change-view"
label: "123"
show_letters:
action:
set_view: "base"
outline: "change-view"
label: "ABC"
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
label: "*/="
show_eschars:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "change-view"
label: "Ää"
space:
outline: "spaceline"
text: " "
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
ä-subtle-highlight:
outline: "subtle-highlight"
text: "ä"
ö-subtle-highlight:
outline: "subtle-highlight"
text: "ö"
ü-subtle-highlight-2:
outline: "subtle-highlight-2"
text: "ü"
Ä-subtle-highlight:
outline: "subtle-highlight"
text: "Ä"
Ö-subtle-highlight:
outline: "subtle-highlight"
text: "Ö"
Ü-subtle-highlight:
outline: "subtle-highlight"
text: "Ü"
ß-subtle-highlight:
outline: "subtle-highlight"
text: "ß"
5:
outline: "fill"
"&":
outline: "fill"
·:
outline: "fill"
¥:
outline: "fill"
ô:
outline: "fill"
Ç:
outline: "fill"
":":
outline: "fill"
π:
outline: "fill"

121
data/keyboards/de+bone_wide.yaml Normal file
View File

@ -0,0 +1,121 @@
---
outlines:
default: { width: 48.87, height: 42 }
subtle-highlight: { width: 48.87, height: 42 }
special: { width: 48.87, height: 42 }
altline: { width: 73.31, height: 42 }
change-view: { width: 73.31, height: 42 }
fill: { width: 97.74, height: 42 }
subtle-highlight-2: { width: 97.74, height: 42 }
spaceline: { width: 171.03, height: 42 }
views:
base:
- "j d u a x p h l m w ß"
- "c t i e o b n r s g q"
- "Shift_L f v ü ä ö y z k BackSpace"
- "show_numbers show_eschars preferences space , . Return"
upper:
- "J D U A X P H L M W ẞ"
- "C T I E O B N R S G Q"
- "Shift_L F V Ü Ä Ö Y Z K BackSpace"
- "show_numbers show_eschars preferences space ! ? Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols ; \" ' : = < > BackSpace"
- "show_letters show_eschars preferences space , . Return"
symbols:
- "~ ` ´ | · √ µ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / § π τ [ ] BackSpace"
- "show_letters show_eschars preferences space , . Return"
eschars:
- "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
- "à â ê î ô À Â Ê Î Ô"
- "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
- "show_letters show_eschars preferences space „ “ Return"
buttons:
Shift_L:
action:
locking:
lock_view: "upper"
unlock_view: "base"
outline: "change-view"
icon: "key-shift"
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
set_view: "numbers"
outline: "change-view"
label: "123"
show_letters:
action:
set_view: "base"
outline: "change-view"
label: "ABC"
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
label: "*/="
show_eschars:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "change-view"
label: "Ää"
space:
outline: "spaceline"
text: " "
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
ä-subtle-highlight:
outline: "subtle-highlight"
text: "ä"
ö-subtle-highlight:
outline: "subtle-highlight"
text: "ö"
ü-subtle-highlight-2:
outline: "subtle-highlight-2"
text: "ü"
Ä-subtle-highlight:
outline: "subtle-highlight"
text: "Ä"
Ö-subtle-highlight:
outline: "subtle-highlight"
text: "Ö"
Ü-subtle-highlight:
outline: "subtle-highlight"
text: "Ü"
ß-subtle-highlight:
outline: "subtle-highlight"
text: "ß"
5:
outline: "fill"
"&":
outline: "fill"
·:
outline: "fill"
¥:
outline: "fill"
ô:
outline: "fill"
Ç:
outline: "fill"
":":
outline: "fill"
π:
outline: "fill"

121
data/keyboards/de+neo.yaml Normal file
View File

@ -0,0 +1,121 @@
---
outlines:
default: { width: 32.12, height: 52 }
subtle-highlight: { width: 32.12, height: 52 }
special: { width: 32.12, height: 52 }
altline: { width: 48.17, height: 52 }
change-view: { width: 48.17, height: 52 }
fill: { width: 64.24, height: 52 }
subtle-highlight-2: { width: 64.24, height: 52 }
spaceline: { width: 112.45, height: 52 }
views:
base:
- "x v l c w k h g f q ß"
- "u i a e o s n r t d y"
- "Shift_L ü ö ä p z b m j BackSpace"
- "show_numbers show_eschars preferences space , . Return"
upper:
- "X V L C W K H G F Q ẞ"
- "U I A E O S N R T D Y"
- "Shift_L Ü Ö Ä P Z B M J BackSpace"
- "show_numbers show_eschars preferences space ! ? Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols ; \" ' : = < > BackSpace"
- "show_letters show_eschars preferences space , . Return"
symbols:
- "~ ` ´ | · √ µ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / § π τ [ ] BackSpace"
- "show_letters show_eschars preferences space , . Return"
eschars:
- "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
- "à â ê î ô À Â Ê Î Ô"
- "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
- "show_letters show_eschars preferences space „ “ Return"
buttons:
Shift_L:
action:
locking:
lock_view: "upper"
unlock_view: "base"
outline: "change-view"
icon: "key-shift"
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
set_view: "numbers"
outline: "change-view"
label: "123"
show_letters:
action:
set_view: "base"
outline: "change-view"
label: "ABC"
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
label: "*/="
show_eschars:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "change-view"
label: "Ää"
space:
outline: "spaceline"
text: " "
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
ä-subtle-highlight:
outline: "subtle-highlight"
text: "ä"
ö-subtle-highlight:
outline: "subtle-highlight"
text: "ö"
ü-subtle-highlight-2:
outline: "subtle-highlight-2"
text: "ü"
Ä-subtle-highlight:
outline: "subtle-highlight"
text: "Ä"
Ö-subtle-highlight:
outline: "subtle-highlight"
text: "Ö"
Ü-subtle-highlight:
outline: "subtle-highlight"
text: "Ü"
ß-subtle-highlight:
outline: "subtle-highlight"
text: "ß"
5:
outline: "fill"
"&":
outline: "fill"
·:
outline: "fill"
¥:
outline: "fill"
ô:
outline: "fill"
Ç:
outline: "fill"
":":
outline: "fill"
π:
outline: "fill"

121
data/keyboards/de+neo_wide.yaml Normal file
View File

@ -0,0 +1,121 @@
---
outlines:
default: { width: 48.87, height: 42 }
subtle-highlight: { width: 48.87, height: 42 }
special: { width: 48.87, height: 42 }
altline: { width: 73.31, height: 42 }
change-view: { width: 73.31, height: 42 }
fill: { width: 97.74, height: 42 }
subtle-highlight-2: { width: 97.74, height: 42 }
spaceline: { width: 171.03, height: 42 }
views:
base:
- "x v l c w k h g f q ß"
- "u i a e o s n r t d y"
- "Shift_L ü ö ä p z b m j BackSpace"
- "show_numbers show_eschars preferences space , . Return"
upper:
- "X V L C W K H G F Q ẞ"
- "U I A E O S N R T D Y"
- "Shift_L Ü Ö Ä P Z B M J BackSpace"
- "show_numbers show_eschars preferences space ! ? Return"
numbers:
- "1 2 3 4 5 6 7 8 9 0"
- "@ # € % & - _ + ( )"
- "show_symbols ; \" ' : = < > BackSpace"
- "show_letters show_eschars preferences space , . Return"
symbols:
- "~ ` ´ | · √ µ ÷ × ¶"
- "© ® £ $ ¥ ^ ° * { }"
- "show_numbers \\ / § π τ [ ] BackSpace"
- "show_letters show_eschars preferences space , . Return"
eschars:
- "ä-subtle-highlight è é ö-subtle-highlight ü-subtle-highlight-2 Ä-subtle-highlight È É Ö-subtle-highlight Ü-subtle-highlight"
- "à â ê î ô À Â Ê Î Ô"
- "show_numbers « » ç Ç æ œ ß-subtle-highlight BackSpace"
- "show_letters show_eschars preferences space „ “ Return"
buttons:
Shift_L:
action:
locking:
lock_view: "upper"
unlock_view: "base"
outline: "change-view"
icon: "key-shift"
BackSpace:
outline: "altline"
icon: "edit-clear-symbolic"
action: "erase"
preferences:
action: "show_prefs"
outline: "special"
icon: "keyboard-mode-symbolic"
show_numbers:
action:
set_view: "numbers"
outline: "change-view"
label: "123"
show_letters:
action:
set_view: "base"
outline: "change-view"
label: "ABC"
show_symbols:
action:
set_view: "symbols"
outline: "change-view"
label: "*/="
show_eschars:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "change-view"
label: "Ää"
space:
outline: "spaceline"
text: " "
Return:
outline: "altline"
icon: "key-enter"
keysym: "Return"
ä-subtle-highlight:
outline: "subtle-highlight"
text: "ä"
ö-subtle-highlight:
outline: "subtle-highlight"
text: "ö"
ü-subtle-highlight-2:
outline: "subtle-highlight-2"
text: "ü"
Ä-subtle-highlight:
outline: "subtle-highlight"
text: "Ä"
Ö-subtle-highlight:
outline: "subtle-highlight"
text: "Ö"
Ü-subtle-highlight:
outline: "subtle-highlight"
text: "Ü"
ß-subtle-highlight:
outline: "subtle-highlight"
text: "ß"
5:
outline: "fill"
"&":
outline: "fill"
·:
outline: "fill"
¥:
outline: "fill"
ô:
outline: "fill"
Ç:
outline: "fill"
":":
outline: "fill"
π:
outline: "fill"

20
src/resources.rs
View File

@ -35,22 +35,25 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
("ca", include_str!("../data/keyboards/ca.yaml")),
("ca_wide", include_str!("../data/keyboards/ca_wide.yaml")),
("ch+fr", include_str!("../data/keyboards/ch+fr.yaml")),
("ch+fr_wide", include_str!("../data/keyboards/ch+fr_wide.yaml")),
("ch+de", include_str!("../data/keyboards/ch+de.yaml")),
("ch+de_wide", include_str!("../data/keyboards/ch+de_wide.yaml")),
("ch", include_str!("../data/keyboards/ch.yaml")),
("ch_wide", include_str!("../data/keyboards/ch_wide.yaml")),
("de", include_str!("../data/keyboards/de.yaml")),
("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
("ch+de", include_str!("../data/keyboards/ch+de.yaml")),
("ch+de_wide", include_str!("../data/keyboards/ch+de_wide.yaml")),
("ch+fr", include_str!("../data/keyboards/ch+fr.yaml")),
("ch+fr_wide", include_str!("../data/keyboards/ch+fr_wide.yaml")),
("cz", include_str!("../data/keyboards/cz.yaml")),
("cz_wide", include_str!("../data/keyboards/cz_wide.yaml")),
("cz+qwerty", include_str!("../data/keyboards/cz+qwerty.yaml")),
("cz+qwerty_wide", include_str!("../data/keyboards/cz+qwerty_wide.yaml")),
("de", include_str!("../data/keyboards/de.yaml")),
("de_wide", include_str!("../data/keyboards/de_wide.yaml")),
("de+bone", include_str!("../data/keyboards/de+bone.yaml")),
("de+bone_wide", include_str!("../data/keyboards/de+bone_wide.yaml")),
("de+neo", include_str!("../data/keyboards/de+neo.yaml")),
("de+neo_wide", include_str!("../data/keyboards/de+neo_wide.yaml")),
("dk", include_str!("../data/keyboards/dk.yaml")),
("dk_wide", include_str!("../data/keyboards/dk_wide.yaml")),
@ -129,7 +132,6 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
("us+colemak", include_str!("../data/keyboards/us+colemak.yaml")),
("us+colemak_wide", include_str!("../data/keyboards/us+colemak_wide.yaml")),
("us+dvorak", include_str!("../data/keyboards/us+dvorak.yaml")),
("us+dvorak_wide", include_str!("../data/keyboards/us+dvorak_wide.yaml")),

2
tests/meson.build
View File

@ -72,6 +72,8 @@ foreach layout : [
'cz', 'cz_wide',
'cz+qwerty', 'cz+qwerty_wide',
'de', 'de_wide',
'de+bone', 'de+bone_wide',
'de+neo', 'de+neo_wide',
'dk', 'dk_wide',
'epo', 'epo_wide',
'es', 'es_wide',