From c4e3c32c799fa3774cd5a0597f6c2b06e7f1f31f Mon Sep 17 00:00:00 2001 From: MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org> Date: Thu, 2 May 2024 18:00:58 +0200 Subject: [PATCH] Layouts: Add various small size-improvements and fixes for some layouts Part-of: --- data/keyboards/am+phonetic.yaml | 26 +++++++++------- data/keyboards/am+phonetic_wide.yaml | 14 ++++++--- data/keyboards/am.yaml | 26 +++++++++------- data/keyboards/am_wide.yaml | 26 +++++++++------- data/keyboards/ara.yaml | 15 ++++++---- data/keyboards/cz+qwerty.yaml | 4 +-- data/keyboards/cz+qwerty_wide.yaml | 4 +-- data/keyboards/cz.yaml | 4 +-- data/keyboards/cz_wide.yaml | 4 +-- data/keyboards/dk.yaml | 28 ++++++++++------- data/keyboards/fi.yaml | 28 ++++++++++------- data/keyboards/no.yaml | 28 ++++++++++------- data/keyboards/pl.yaml | 4 +-- data/keyboards/pl_wide.yaml | 4 +-- data/keyboards/ru.yaml | 39 +++++++++++------------- data/keyboards/ru_wide.yaml | 27 +++++++---------- data/keyboards/se.yaml | 29 ++++++++++-------- data/keyboards/th.yaml | 18 +++++------ data/keyboards/ua.yaml | 45 +++++++++++++--------------- data/keyboards/ua_wide.yaml | 33 +++++++++----------- 20 files changed, 219 insertions(+), 187 deletions(-) diff --git a/data/keyboards/am+phonetic.yaml b/data/keyboards/am+phonetic.yaml index 76c71c36..7cdb4d8c 100644 --- a/data/keyboards/am+phonetic.yaml +++ b/data/keyboards/am+phonetic.yaml @@ -3,14 +3,15 @@ # Oct 2021 --- outlines: - default: { width: 34.3, height: 52 } - altline: { width: 52, height: 52 } - wide: { width: 52, height: 52 } - change-view: { width: 52, height: 52 } - spaceline: { width: 255, height: 52 } - special: { width: 44, height: 52 } - large: { width: 44, height: 52 } - placeholder: { width: 34.3, height: 52 } + default: { width: 34.3, height: 52 } + altline: { width: 52, height: 52 } + wide: { width: 104, height: 52 } + change-view: { width: 52, height: 52 } + change-view-2: { width: 104, height: 52 } + spaceline: { width: 150.99, height: 52 } + special: { width: 44, height: 52 } + large: { width: 44, height: 52 } + placeholder: { width: 34.3, height: 52 } views: base: @@ -35,7 +36,7 @@ views: - "* # \\ % < > = [ ]" - "© $ / & - _ + ( )" - "® £ € ¥ ^ ° @ { }" - - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace" + - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace" - "show_letters preferences space . Return" buttons: @@ -55,6 +56,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -62,7 +68,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ԱԲԳ" show_symbols: action: diff --git a/data/keyboards/am+phonetic_wide.yaml b/data/keyboards/am+phonetic_wide.yaml index 589d7388..81114972 100644 --- a/data/keyboards/am+phonetic_wide.yaml +++ b/data/keyboards/am+phonetic_wide.yaml @@ -5,9 +5,10 @@ outlines: default: { width: 51.7, height: 42 } altline: { width: 77.5, height: 42 } - wide: { width: 77.5, height: 42 } + wide: { width: 103.35, height: 42 } change-view: { width: 77.5, height: 42 } - spaceline: { width: 392, height: 42 } + change-view-2: { width: 103.35, height: 42 } + spaceline: { width: 340.3, height: 42 } special: { width: 62.27, height: 42 } large: { width: 62.27, height: 42 } placeholder: { width: 51.7, height: 42 } @@ -35,7 +36,7 @@ views: - "* # \\ % < > = [ ]" - "© $ / & - _ + ( )" - "® £ € ¥ ^ ° @ { }" - - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace" + - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace" - "show_letters preferences space . Return" buttons: @@ -55,6 +56,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -62,7 +68,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ԱԲԳ" show_symbols: action: diff --git a/data/keyboards/am.yaml b/data/keyboards/am.yaml index 0e07b688..dc186ff1 100644 --- a/data/keyboards/am.yaml +++ b/data/keyboards/am.yaml @@ -3,14 +3,15 @@ # Oct 2021 --- outlines: - default: { width: 34.3, height: 52 } - altline: { width: 52, height: 52 } - wide: { width: 52, height: 52 } - change-view: { width: 52, height: 52 } - spaceline: { width: 255, height: 52 } - special: { width: 44, height: 52 } - large: { width: 44, height: 52 } - placeholder: { width: 34.3, height: 52 } + default: { width: 34.3, height: 52 } + altline: { width: 52, height: 52 } + wide: { width: 104, height: 52 } + change-view: { width: 52, height: 52 } + change-view-2: { width: 104, height: 52 } + spaceline: { width: 150.99, height: 52 } + special: { width: 44, height: 52 } + large: { width: 44, height: 52 } + placeholder: { width: 34.3, height: 52 } views: base: @@ -35,7 +36,7 @@ views: - "* # \\ % < > = [ ]" - "© $ / & - _ + ( )" - "® £ € ¥ ^ ° @ { }" - - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace" + - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace" - "show_letters preferences space . Return" buttons: @@ -55,6 +56,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -62,7 +68,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ԱԲԳ" show_symbols: action: diff --git a/data/keyboards/am_wide.yaml b/data/keyboards/am_wide.yaml index 70c77707..c9dc634d 100644 --- a/data/keyboards/am_wide.yaml +++ b/data/keyboards/am_wide.yaml @@ -3,14 +3,15 @@ # Oct 2021 --- outlines: - default: { width: 51.7, height: 42 } - altline: { width: 77.5, height: 42 } - wide: { width: 77.5, height: 42 } - change-view: { width: 77.5, height: 42 } - spaceline: { width: 392, height: 42 } - special: { width: 62.27, height: 42 } - large: { width: 62.27, height: 42 } - placeholder: { width: 51.7, height: 42 } + default: { width: 51.7, height: 42 } + altline: { width: 77.5, height: 42 } + wide: { width: 103.35, height: 42 } + change-view: { width: 77.5, height: 42 } + change-view-2: { width: 103.35, height: 42 } + spaceline: { width: 340.3, height: 42 } + special: { width: 62.27, height: 42 } + large: { width: 62.27, height: 42 } + placeholder: { width: 51.7, height: 42 } views: base: @@ -35,7 +36,7 @@ views: - "* # \\ % < > = [ ]" - "© $ / & - _ + ( )" - "® £ € ¥ ^ ° @ { }" - - "show_numbers ~ ` | · √ π τ ÷ × ¶ BackSpace" + - "show_numbers_from_symbols ~ ` | · √ π τ ÷ × ¶ BackSpace" - "show_letters preferences space . Return" buttons: @@ -55,6 +56,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -62,7 +68,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ԱԲԳ" show_symbols: action: diff --git a/data/keyboards/ara.yaml b/data/keyboards/ara.yaml index 086557d1..18a6b52b 100644 --- a/data/keyboards/ara.yaml +++ b/data/keyboards/ara.yaml @@ -1,12 +1,12 @@ # Maintained by: Khaled Eldoheiri --- outlines: - default: { width: 32.95, height: 52 } + default: { width: 32.95, height: 52 } altline: { width: 48.99, height: 52 } wide: { width: 62, height: 52 } change-view: { width: 48.99, height: 52 } change-view-2: { width: 62, height: 52 } - spaceline: { width: 195.65, height: 52 } + spaceline: { width: 169.63, height: 52 } special: { width: 35.66, height: 52 } fill: { width: 65.32, height: 52 } @@ -29,7 +29,7 @@ views: symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers \\ / < > = [ ] BackSpace" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" - "show_letters preferences space . Return" buttons: @@ -49,6 +49,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -56,7 +61,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ض" show_symbols: action: @@ -67,7 +72,7 @@ buttons: outline: "spaceline" text: " " Return: - outline: "altline" + outline: "wide" icon: "key-enter" keysym: "Return" 5: diff --git a/data/keyboards/cz+qwerty.yaml b/data/keyboards/cz+qwerty.yaml index 0576f9e8..b2f34ac2 100644 --- a/data/keyboards/cz+qwerty.yaml +++ b/data/keyboards/cz+qwerty.yaml @@ -32,12 +32,12 @@ views: - "show_letters show_accents preferences space , . Return" accents: - "ä ě é ř ť ý ů í ó ö" - - "á š ď ë ŕ ú ü ô ľ --" + - "á š ď ë ŕ ú ü ô ľ" - "accents_Shift_L ž ß č ç ñ ň ĺ BackSpace" - "show_letters show_accents preferences space , . Return" upper_accents: - "Ä Ě É Ř Ť Ý Ů Í Ó Ö" - - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" - "accents_Shift_L Ž ẞ Č Ç Ñ Ň Ĺ BackSpace" - "show_letters show_upper_accents preferences space , . Return" diff --git a/data/keyboards/cz+qwerty_wide.yaml b/data/keyboards/cz+qwerty_wide.yaml index dd5e3d8c..5d109037 100644 --- a/data/keyboards/cz+qwerty_wide.yaml +++ b/data/keyboards/cz+qwerty_wide.yaml @@ -32,12 +32,12 @@ views: - "show_letters show_accents preferences space , . Return" accents: - "ä ě é ř ť ý ů í ó ö" - - "á š ď ë ŕ ú ü ô ľ --" + - "á š ď ë ŕ ú ü ô ľ" - "accents_Shift_L ž ß č ç ñ ň ĺ BackSpace" - "show_letters show_accents preferences space , . Return" upper_accents: - "Ä Ě É Ř Ť Ý Ů Í Ó Ö" - - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" - "accents_Shift_L Ž ẞ Č Ç Ñ Ň Ĺ BackSpace" - "show_letters show_upper_accents preferences space , . Return" diff --git a/data/keyboards/cz.yaml b/data/keyboards/cz.yaml index fb3da973..92bbac06 100644 --- a/data/keyboards/cz.yaml +++ b/data/keyboards/cz.yaml @@ -32,12 +32,12 @@ views: - "show_letters show_accents preferences space , . Return" accents: - "ä ě é ř ť ž ů í ó ö" - - "á š ď ë ŕ ú ü ô ľ --" + - "á š ď ë ŕ ú ü ô ľ" - "accents_Shift_L ý ß č ç ñ ň ĺ BackSpace" - "show_letters show_accents preferences space , . Return" upper_accents: - "Ä Ě É Ř Ť Ž Ů Í Ó Ö" - - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" - "accents_Shift_L Ý ẞ Č Ç Ñ Ň Ĺ BackSpace" - "show_letters show_upper_accents preferences space , . Return" diff --git a/data/keyboards/cz_wide.yaml b/data/keyboards/cz_wide.yaml index f8b8d7a1..5d5d97b8 100644 --- a/data/keyboards/cz_wide.yaml +++ b/data/keyboards/cz_wide.yaml @@ -32,12 +32,12 @@ views: - "show_letters show_accents preferences space , . Return" accents: - "ä ě é ř ť ž ů í ó ö" - - "á š ď ë ŕ ú ü ô ľ --" + - "á š ď ë ŕ ú ü ô ľ" - "accents_Shift_L ý ß č ç ñ ň ĺ BackSpace" - "show_letters show_accents preferences space , . Return" upper_accents: - "Ä Ě É Ř Ť Ž Ů Í Ó Ö" - - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ --" + - "Á Š Ď Ë Ŕ Ú Ü Ô Ľ" - "accents_Shift_L Ý ẞ Č Ç Ñ Ň Ĺ BackSpace" - "show_letters show_upper_accents preferences space , . Return" diff --git a/data/keyboards/dk.yaml b/data/keyboards/dk.yaml index d625a057..25fb44de 100644 --- a/data/keyboards/dk.yaml +++ b/data/keyboards/dk.yaml @@ -1,14 +1,15 @@ --- outlines: - default: { width: 32.4, height: 52 } - altline: { width: 48.39, height: 52 } - large: { width: 48.39, height: 52 } - wide: { width: 62, height: 52 } - change-view: { width: 48.39, height: 52 } - spaceline: { width: 150, height: 52 } - special: { width: 48, height: 52 } - placeholder: { width: 32, height: 52 } - fill: { width: 64, height: 52 } + default: { width: 32.4, height: 52 } + altline: { width: 48.39, height: 52 } + large: { width: 48.39, height: 52 } + wide: { width: 62, height: 52 } + change-view: { width: 48.39, height: 52 } + change-view-2: { width: 62, height: 52 } + spaceline: { width: 136.39, height: 52 } + special: { width: 48, height: 52 } + placeholder: { width: 32, height: 52 } + fill: { width: 64, height: 52 } views: base: @@ -29,7 +30,7 @@ views: symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers -- \\ / < > = [ ] BackSpace" + - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace" - "show_letters preferences space . Return" buttons: @@ -49,6 +50,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -56,7 +62,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ABC" show_symbols: action: diff --git a/data/keyboards/fi.yaml b/data/keyboards/fi.yaml index 640165a2..35e9bd69 100644 --- a/data/keyboards/fi.yaml +++ b/data/keyboards/fi.yaml @@ -1,14 +1,15 @@ --- outlines: - default: { width: 32.4, height: 52 } - altline: { width: 48.39, height: 52 } - large: { width: 48.39, height: 52 } - wide: { width: 62, height: 52 } - change-view: { width: 48.39, height: 52 } - spaceline: { width: 150, height: 52 } - special: { width: 48, height: 52 } - placeholder: { width: 32, height: 52 } - fill: { width: 64, height: 52 } + default: { width: 32.4, height: 52 } + altline: { width: 48.39, height: 52 } + large: { width: 48.39, height: 52 } + wide: { width: 62, height: 52 } + change-view: { width: 48.39, height: 52 } + change-view-2: { width: 62, height: 52 } + spaceline: { width: 136.39, height: 52 } + special: { width: 48, height: 52 } + placeholder: { width: 32, height: 52 } + fill: { width: 64, height: 52 } views: base: @@ -29,7 +30,7 @@ views: symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers -- \\ / < > = [ ] BackSpace" + - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace" - "show_letters preferences space . Return" buttons: @@ -49,6 +50,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -56,7 +62,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ABC" show_symbols: action: diff --git a/data/keyboards/no.yaml b/data/keyboards/no.yaml index 0f3743fd..a281d5c8 100644 --- a/data/keyboards/no.yaml +++ b/data/keyboards/no.yaml @@ -1,14 +1,15 @@ --- outlines: - default: { width: 32.4, height: 52 } - altline: { width: 48.39, height: 52 } - large: { width: 48.39, height: 52 } - wide: { width: 62, height: 52 } - change-view: { width: 48.39, height: 52 } - spaceline: { width: 150, height: 52 } - special: { width: 48, height: 52 } - placeholder: { width: 32, height: 52 } - fill: { width: 64, height: 52 } + default: { width: 32.4, height: 52 } + altline: { width: 48.39, height: 52 } + large: { width: 48.39, height: 52 } + wide: { width: 62, height: 52 } + change-view: { width: 48.39, height: 52 } + change-view-2: { width: 62, height: 52 } + spaceline: { width: 136.39, height: 52 } + special: { width: 48, height: 52 } + placeholder: { width: 32, height: 52 } + fill: { width: 64, height: 52 } views: base: @@ -29,7 +30,7 @@ views: symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers -- \\ / < > = [ ] BackSpace" + - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace" - "show_letters preferences space . Return" buttons: @@ -49,6 +50,11 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" @@ -56,7 +62,7 @@ buttons: show_letters: action: set_view: "base" - outline: "change-view" + outline: "change-view-2" label: "ABC" show_symbols: action: diff --git a/data/keyboards/pl.yaml b/data/keyboards/pl.yaml index f3a673e5..c66c33b4 100644 --- a/data/keyboards/pl.yaml +++ b/data/keyboards/pl.yaml @@ -33,12 +33,12 @@ views: - "show_letters preferences space .-large Return" accents: - "q w ę r t y u i ó p" - - "ą ś d f g h j k ł ." + - "ą ś d f g h j k ł" - "accents_show_upper ż ź ć v b ń m BackSpace" - "show_numbers preferences space show_accents Return" upper_accents: - "Q W Ę R T Y U I Ó P" - - "Ą Ś D F G H J K Ł ," + - "Ą Ś D F G H J K Ł" - "accents_show_upper Ż Ź Ć V B Ń M BackSpace" - "show_numbers preferences space show_upper_accents Return" diff --git a/data/keyboards/pl_wide.yaml b/data/keyboards/pl_wide.yaml index b80f29a4..d0632594 100644 --- a/data/keyboards/pl_wide.yaml +++ b/data/keyboards/pl_wide.yaml @@ -33,12 +33,12 @@ views: - "show_letters preferences space .-large Return" accents: - "q w ę r t y u i ó p" - - "ą ś d f g h j k ł ." + - "ą ś d f g h j k ł" - "accents_show_upper ż ź ć v b ń m BackSpace" - "show_numbers preferences space show_accents Return" upper_accents: - "Q W Ę R T Y U I Ó P" - - "Ą Ś D F G H J K Ł ," + - "Ą Ś D F G H J K Ł" - "accents_show_upper Ż Ź Ć V B Ń M BackSpace" - "show_numbers preferences space show_upper_accents Return" diff --git a/data/keyboards/ru.yaml b/data/keyboards/ru.yaml index 0a404d64..fd83c8da 100644 --- a/data/keyboards/ru.yaml +++ b/data/keyboards/ru.yaml @@ -1,17 +1,16 @@ --- outlines: - default: { width: 32.45, height: 52 } - altline: { width: 32, height: 52 } - wide: { width: 57, height: 52 } - change-view: { width: 32, height: 52 } - change-view-2: { width: 57, height: 52 } - narrow: { width: 26, height: 52 } - spaceline: { width: 107, height: 52 } - fill: { width: 159, height: 52 } - fill-2: { width: 64.9, height: 52 } - special: { width: 42, height: 52 } - large: { width: 42, height: 52 } - placeholder: { width: 40, height: 52 } + default: { width: 32.45, height: 52 } + altline: { width: 32, height: 52 } + wide: { width: 64.55, height: 52 } + change-view: { width: 32, height: 52 } + change-view-2: { width: 64.55, height: 52 } + spaceline: { width: 91.96, height: 52 } + fill: { width: 156.86, height: 52 } + fill-2: { width: 64.9, height: 52 } + special: { width: 35.67, height: 52 } + large: { width: 35.67, height: 52 } + placeholder: { width: 32.45, height: 52 } views: base: @@ -27,12 +26,12 @@ views: numbers: - "1 2 3 4 5 6 7 8 9 0" - "@ # $ % & - _ + ( )" - - "show_symbols , \" ' : ; ! ? -- BackSpace" + - "show_symbols , \" ' : ; ! ? BackSpace-wide" - "show_letters preferences space-fill . Return" symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers \\ / < > = [ ] -- BackSpace" + - "show_numbers \\ / < > = [ ] BackSpace-wide" - "show_letters preferences space-fill . Return" buttons: @@ -47,6 +46,10 @@ buttons: outline: "altline" icon: "edit-clear-symbolic" action: "erase" + BackSpace-wide: + outline: "wide" + icon: "edit-clear-symbolic" + action: "erase" preferences: action: "show_prefs" outline: "special" @@ -81,14 +84,6 @@ buttons: outline: "wide" icon: "key-enter" keysym: "Return" - ё: - outline: "narrow" - Ё: - outline: "narrow" - ъ: - outline: "narrow" - Ъ: - outline: "narrow" --: outline: "placeholder" text: "" diff --git a/data/keyboards/ru_wide.yaml b/data/keyboards/ru_wide.yaml index 2e66aaea..2d6eacc6 100644 --- a/data/keyboards/ru_wide.yaml +++ b/data/keyboards/ru_wide.yaml @@ -2,15 +2,14 @@ outlines: default: { width: 48.75, height: 42 } altline: { width: 48.75, height: 42 } - wide: { width: 85.5, height: 42 } + wide: { width: 97.5, height: 42 } change-view: { width: 48.75, height: 42 } - change-view-2: { width: 85.5, height: 42 } - narrow: { width: 39, height: 42 } - spaceline: { width: 190, height: 42 } - fill: { width: 268, height: 42 } + change-view-2: { width: 97.5, height: 42 } + spaceline: { width: 146.5, height: 42 } + fill: { width: 244, height: 42 } fill-2: { width: 97.5, height: 42 } special: { width: 48.75, height: 42 } - placeholder: { width: 60.75, height: 42 } + placeholder: { width: 48.75, height: 42 } views: base: @@ -26,12 +25,12 @@ views: numbers: - "1 2 3 4 5 6 7 8 9 0" - "@ # $ % & - _ + ( )" - - "show_symbols , \" ' : ; ! ? -- BackSpace" + - "show_symbols , \" ' : ; ! ? BackSpace-wide" - "show_letters preferences space-fill . Return" symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers \\ / < > = [ ] -- BackSpace" + - "show_numbers \\ / < > = [ ] BackSpace-wide" - "show_letters preferences space-fill . Return" buttons: @@ -46,6 +45,10 @@ buttons: outline: "altline" icon: "edit-clear-symbolic" action: "erase" + BackSpace-wide: + outline: "wide" + icon: "edit-clear-symbolic" + action: "erase" preferences: action: "show_prefs" outline: "special" @@ -75,14 +78,6 @@ buttons: outline: "wide" icon: "key-enter" keysym: "Return" - ё: - outline: "narrow" - Ё: - outline: "narrow" - ъ: - outline: "narrow" - Ъ: - outline: "narrow" --: outline: "placeholder" text: "" diff --git a/data/keyboards/se.yaml b/data/keyboards/se.yaml index 5ae12c85..1144b202 100644 --- a/data/keyboards/se.yaml +++ b/data/keyboards/se.yaml @@ -1,16 +1,16 @@ --- outlines: - default: { width: 32.4, height: 52 } - altline: { width: 48.39, height: 52 } - large: { width: 48.39, height: 52 } - wide: { width: 62, height: 52 } - change-view: { width: 48.39, height: 52 } - spaceline: { width: 150, height: 52 } - special: { width: 48, height: 52 } - placeholder: { width: 32, height: 52 } - fill: { width: 64, height: 52 } + default: { width: 32.4, height: 52 } + altline: { width: 48.39, height: 52 } + large: { width: 48.39, height: 52 } + wide: { width: 62, height: 52 } + change-view: { width: 48.39, height: 52 } + change-view-2: { width: 62, height: 52 } + spaceline: { width: 136.39, height: 52 } + special: { width: 48, height: 52 } + placeholder: { width: 32, height: 52 } + fill: { width: 64, height: 52 } - views: base: - "q w e r t y u i o p å" @@ -30,7 +30,7 @@ views: symbols: - "µ ~ ` | · √ π τ ÷ × ¶" - "½ ¤ © ® £ ¥ ^ ° * { }" - - "show_numbers -- \\ / < > = [ ] BackSpace" + - "show_numbers_from_symbols -- \\ / < > = [ ] BackSpace" - "show_letters preferences space . Return" buttons: @@ -50,14 +50,19 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: + action: + set_view: "numbers" + outline: "change-view-2" + label: "123" + show_numbers_from_symbols: action: set_view: "numbers" outline: "change-view" label: "123" show_letters: - outline: "change-view" action: set_view: "base" + outline: "change-view-2" label: "ABC" show_symbols: action: diff --git a/data/keyboards/th.yaml b/data/keyboards/th.yaml index e806c326..31890532 100644 --- a/data/keyboards/th.yaml +++ b/data/keyboards/th.yaml @@ -1,14 +1,14 @@ --- outlines: - default: { width: 34, height: 52 } - large: { width: 44, height: 52 } - altline: { width: 52.67, height: 52 } - wide: { width: 62, height: 52 } - change-view: { width: 52.67, height: 52 } - change-view-2: { width: 62, height: 52 } - spaceline: { width: 233.34, height: 52 } - special: { width: 44, height: 52 } - placeholder: { width: 34, height: 52 } + default: { width: 34, height: 52 } + large: { width: 44, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 86.67, height: 52 } + change-view: { width: 52.67, height: 52 } + change-view-2: { width: 86.67, height: 52 } + spaceline: { width: 184, height: 52 } + special: { width: 44, height: 52 } + placeholder: { width: 34, height: 52 } views: base: diff --git a/data/keyboards/ua.yaml b/data/keyboards/ua.yaml index efc8afd3..b2804db3 100644 --- a/data/keyboards/ua.yaml +++ b/data/keyboards/ua.yaml @@ -1,17 +1,16 @@ --- outlines: - default: { width: 32.45, height: 52 } - altline: { width: 32, height: 52 } - wide: { width: 57, height: 52 } - change-view: { width: 32, height: 52 } - change-view-2: { width: 57, height: 52 } - narrow: { width: 26, height: 52 } - spaceline: { width: 107, height: 52 } - fill: { width: 159, height: 52 } - fill-2: { width: 64.9, height: 52 } - special: { width: 42, height: 52 } - large: { width: 42, height: 52 } - placeholder: { width: 40, height: 52 } + default: { width: 32.45, height: 52 } + altline: { width: 32, height: 52 } + wide: { width: 64.55, height: 52 } + change-view: { width: 32, height: 52 } + change-view-2: { width: 64.55, height: 52 } + spaceline: { width: 91.96, height: 52 } + fill: { width: 156.86, height: 52 } + fill-2: { width: 64.9, height: 52 } + special: { width: 35.67, height: 52 } + large: { width: 35.67, height: 52 } + placeholder: { width: 32.45, height: 52 } views: base: @@ -27,13 +26,13 @@ views: numbers: - "1 2 3 4 5 6 7 8 9 0" - "@ # $ % & - _ + ( )" - - "show_symbols , \" ' : ; ! ? -- BackSpace" - - "show_letters preferences space_fill . Return" + - "show_symbols , \" ' : ; ! ? BackSpace-wide" + - "show_letters preferences space-fill . Return" symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers \\ / < > = [ ] -- BackSpace" - - "show_letters preferences space_fill . Return" + - "show_numbers \\ / < > = [ ] BackSpace-wide" + - "show_letters preferences space-fill . Return" buttons: Shift_L: @@ -47,6 +46,10 @@ buttons: outline: "altline" icon: "edit-clear-symbolic" action: "erase" + BackSpace-wide: + outline: "wide" + icon: "edit-clear-symbolic" + action: "erase" preferences: action: "show_prefs" outline: "special" @@ -74,21 +77,13 @@ buttons: space: outline: "spaceline" text: " " - space_fill: + space-fill: outline: "fill" text: " " Return: outline: "wide" icon: "key-enter" keysym: "Return" - ґ: - outline: "narrow" - Ґ: - outline: "narrow" - ї: - outline: "narrow" - Ї: - outline: "narrow" --: outline: "placeholder" text: "" diff --git a/data/keyboards/ua_wide.yaml b/data/keyboards/ua_wide.yaml index 0b8da301..6e3994a2 100644 --- a/data/keyboards/ua_wide.yaml +++ b/data/keyboards/ua_wide.yaml @@ -2,15 +2,14 @@ outlines: default: { width: 48.75, height: 42 } altline: { width: 48.75, height: 42 } - wide: { width: 85.5, height: 42 } + wide: { width: 97.5, height: 42 } change-view: { width: 48.75, height: 42 } - change-view-2: { width: 85.5, height: 42 } - narrow: { width: 39, height: 42 } - spaceline: { width: 190, height: 42 } - fill: { width: 268, height: 42 } + change-view-2: { width: 97.5, height: 42 } + spaceline: { width: 146.5, height: 42 } + fill: { width: 244, height: 42 } fill-2: { width: 97.5, height: 42 } special: { width: 48.75, height: 42 } - placeholder: { width: 60.75, height: 42 } + placeholder: { width: 48.75, height: 42 } views: base: @@ -26,13 +25,13 @@ views: numbers: - "1 2 3 4 5 6 7 8 9 0" - "@ # $ % & - _ + ( )" - - "show_symbols , \" ' : ; ! ? -- BackSpace" - - "show_letters preferences space_fill . Return" + - "show_symbols , \" ' : ; ! ? BackSpace-wide" + - "show_letters preferences space-fill . Return" symbols: - "~ ` | · √ π τ ÷ × ¶" - "© ® £ € ¥ ^ ° * { }" - - "show_numbers \\ / < > = [ ] -- BackSpace" - - "show_letters preferences space_fill . Return" + - "show_numbers \\ / < > = [ ] BackSpace-wide" + - "show_letters preferences space-fill . Return" buttons: Shift_L: @@ -46,6 +45,10 @@ buttons: outline: "altline" icon: "edit-clear-symbolic" action: "erase" + BackSpace-wide: + outline: "wide" + icon: "edit-clear-symbolic" + action: "erase" preferences: action: "show_prefs" outline: "special" @@ -68,21 +71,13 @@ buttons: space: outline: "spaceline" text: " " - space_fill: + space-fill: outline: "fill" text: " " Return: outline: "wide" icon: "key-enter" keysym: "Return" - ґ: - outline: "narrow" - Ґ: - outline: "narrow" - ї: - outline: "narrow" - Ї: - outline: "narrow" --: outline: "placeholder" text: ""