Merge branch 'fix-ch-layout' into 'master'

Fix Swiss layouts

See merge request World/Phosh/squeekboard!612
This commit is contained in:
Marge Bot
2024-03-07 23:19:29 +00:00
3 changed files with 72 additions and 69 deletions

View File

@ -32,7 +32,7 @@ views:
- "à â ç é è ê î ô ù û" - "à â ç é è ê î ô ù û"
- "À Â Ç É È Ê Î Ô Ù Û" - "À Â Ç É È Ê Î Ô Ù Û"
- "show_numbers æ œ ä ë ï ö ü BackSpace" - "show_numbers æ œ ä ë ï ö ü BackSpace"
- "show_letters_from_accents preferences ñ Ñ space ° ß Return" - "show_letters show_eschars preferences ñ Ñ space ° ß Return"
buttons: buttons:
Shift_L: Shift_L:
@ -59,7 +59,7 @@ buttons:
action: action:
set_view: "base" set_view: "base"
outline: "altline" outline: "altline"
label: "abc" label: "ABC"
show_symbols: show_symbols:
action: action:
set_view: "symbols" set_view: "symbols"
@ -71,14 +71,7 @@ buttons:
lock_view: "eschars" lock_view: "eschars"
unlock_view: "base" unlock_view: "base"
outline: "altline" outline: "altline"
label: "âÂ" label: â"
show_letters_from_accents:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "altline"
label: "âÂ"
space: space:
outline: "spaceline" outline: "spaceline"
label: " " label: " "

View File

@ -3,38 +3,39 @@
--- ---
outlines: outlines:
default: { width: 35.33, height: 52 } default: { width: 35.33, height: 58 }
altline: { width: 48, height: 52 } doublewidth: { width: 70.66, height: 58 }
wide: { width: 59, height: 52 } altline: { width: 52.8, height: 58 }
spaceline: { width: 70, height: 52 } wide: { width: 64.9, height: 58 }
special: { width: 28, height: 52 } spaceline: { width: 116.67, height: 58 }
special: { width: 30.41, height: 58 }
views: views:
base: base:
- "q w e r t z u i o p ü" - "q w e r t z u i o p ü"
- "a s d f g h j k l ö ä" - "a s d f g h j k l ö ä"
- "Shift_L y x c v b n m BackSpace" - "Shift_L y x c v b n m ' BackSpace"
- "show_numbers show_eschars preferences ' space , . Return" - "show_numbers show_eschars preferences Space , . Return"
upper: upper:
- "Q W E R T Z U I O P Ü" - "Q W E R T Z U I O P Ü"
- "A S D F G H J K L Ö Ä" - "A S D F G H J K L Ö Ä"
- "Shift_L Y X C V B N M BackSpace" - "Shift_L Y X C V B N M \" BackSpace"
- "show_numbers show_eschars preferences \" space , . Return" - "show_numbers show_eschars preferences Space , . Return"
numbers: numbers:
- "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 , . Return" - "show_letters show_eschars preferences Space , . Return"
symbols: symbols:
- "€ $ £ ¥ % | § µ [ ]" - "€ $ £ ¥ % | § µ [ ]"
- "© ® § ` ^ { } · ¡ ¿" - "© ® § ` { } @ · ¡ ¿"
- "show_numbers « » ÷ × “ ” „ BackSpace" - "show_numbers « » ÷ × “ ” „ BackSpace"
- "show_letters show_eschars preferences - space , . Return" - "show_letters show_eschars preferences Space , . Return"
eschars: eschars:
- "à â ç é è ê î ô ù û" - "à â ç é è ê î ô ù û ñ"
- "À Â Ç É È Ê Î Ô Ù Û" - "À Â Ç É È Ê Î Ô Ù Û Ñ"
- "show_numbers æ œ ä ë ï ö ü BackSpace" - "show_numbers æ œ ä ë ï ö ü ß BackSpace"
- "show_letters_from_accents preferences ñ Ñ space ° ß Return" - "show_letters show_eschars preferences Space ° Return"
buttons: buttons:
Shift_L: Shift_L:
@ -47,7 +48,7 @@ buttons:
BackSpace: BackSpace:
outline: "altline" outline: "altline"
icon: "edit-clear-symbolic" icon: "edit-clear-symbolic"
action: erase action: "erase"
preferences: preferences:
action: "show_prefs" action: "show_prefs"
outline: "special" outline: "special"
@ -61,7 +62,7 @@ buttons:
action: action:
set_view: "base" set_view: "base"
outline: "altline" outline: "altline"
label: "abc" label: "ABC"
show_symbols: show_symbols:
action: action:
set_view: "symbols" set_view: "symbols"
@ -73,15 +74,8 @@ buttons:
lock_view: "eschars" lock_view: "eschars"
unlock_view: "base" unlock_view: "base"
outline: "altline" outline: "altline"
label: "âÂ" label: â"
show_letters_from_accents: Space:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "altline"
label: "âÂ"
space:
outline: "spaceline" outline: "spaceline"
label: " " label: " "
text: " " text: " "
@ -91,3 +85,11 @@ buttons:
keysym: "Return" keysym: "Return"
"\"": "\"":
keysym: "quotedbl" keysym: "quotedbl"
°:
outline: "doublewidth"
"|":
outline: "doublewidth"
"}":
outline: "doublewidth"
×:
outline: "doublewidth"

View File

@ -3,38 +3,41 @@
--- ---
outlines: outlines:
default: { width: 48, height: 42 } default: { width: 48, height: 42 }
altline: { width: 81, height: 42 } doublewidth: { width: 96, height: 42 }
wide: { width: 108, height: 42 } narrow: { width: 33, height: 42 }
spaceline: { width: 216, height: 42 } large: { width: 66, height: 42 }
special: { width: 48, height: 42 } altline: { width: 72, height: 42 }
wide: { width: 108, height: 42 }
spaceline: { width: 162, height: 42 }
special: { width: 48, height: 42 }
views: views:
base: base:
- "q w e r t z u i o p ü" - "q w e r t z u i o p ü"
- "a s d f g h j k l ö ä" - "a s d f g h j k l ö ä"
- "Shift_L y x c v b n m BackSpace" - "Shift_L y x c v b n m ' BackSpace"
- "show_numbers show_eschars preferences ' space , . Return" - "show_numbers show_eschars preferences Space , . Return"
upper: upper:
- "Q W E R T Z U I O P Ü" - "Q W E R T Z U I O P Ü"
- "A S D F G H J K L Ö Ä" - "A S D F G H J K L Ö Ä"
- "Shift_L Y X C V B N M BackSpace" - "Shift_L Y X C V B N M \" BackSpace"
- "show_numbers show_eschars preferences \" space , . Return" - "show_numbers show_eschars preferences Space , . Return"
numbers: numbers:
- "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 , . Return" - "show_letters show_eschars preferences Space , . Return"
symbols: symbols:
- "€ $ £ ¥ % | § µ [ ]" - "€ $ £ ¥ % | § µ [ ]"
- "© ® § ` ^ { } · ¡ ¿" - "© ® § ` { } @ · ¡ ¿"
- "show_numbers « » ÷ × “ ” „ BackSpace" - "show_numbers « » ÷ × “ ” „ BackSpace"
- "show_letters show_eschars preferences - space , . Return" - "show_letters show_eschars preferences Space , . Return"
eschars: eschars:
- "à â ç é è ê î ô ù û" - "à â ç é è ê î ô ù û ñ"
- "À Â Ç É È Ê Î Ô Ù Û" - "À Â Ç É È Ê Î Ô Ù Û Ñ"
- "show_numbers æ œ ä ë ï ö ü BackSpace" - "show_numbers æ œ ä ë ï ö ü ß BackSpace"
- "show_letters_from_accents preferences ñ Ñ space ° ß Return" - "show_letters show_eschars preferences Space ° Return"
buttons: buttons:
Shift_L: Shift_L:
@ -61,7 +64,7 @@ buttons:
action: action:
set_view: "base" set_view: "base"
outline: "altline" outline: "altline"
label: "abc" label: "ABC"
show_symbols: show_symbols:
action: action:
set_view: "symbols" set_view: "symbols"
@ -73,15 +76,8 @@ buttons:
lock_view: "eschars" lock_view: "eschars"
unlock_view: "base" unlock_view: "base"
outline: "altline" outline: "altline"
label: "äÄ" label: "Ââ"
show_letters_from_accents: Space:
action:
locking:
lock_view: "eschars"
unlock_view: "base"
outline: "altline"
label: "âÂ"
space:
outline: "spaceline" outline: "spaceline"
label: " " label: " "
text: " " text: " "
@ -91,3 +87,15 @@ buttons:
keysym: "Return" keysym: "Return"
"\"": "\"":
keysym: "quotedbl" keysym: "quotedbl"
°:
outline: "large"
".":
outline: "narrow"
",":
outline: "narrow"
"|":
outline: "doublewidth"
"}":
outline: "doublewidth"
×:
outline: "doublewidth"