From a6c6946bc917a56dc1f092ef9df1d3be68f4fd83 Mon Sep 17 00:00:00 2001 From: MoonlightWave-12 <135532-MoonlightWave-12@users.noreply.gitlab.gnome.org> Date: Wed, 17 Apr 2024 09:20:47 +0200 Subject: [PATCH] Layouts: Fix some small inconsistencies and remove unused outlines Part-of: --- data/keyboards/ara.yaml | 1 - data/keyboards/ara_wide.yaml | 1 - data/keyboards/ch+de.yaml | 1 - data/keyboards/ch+de_wide.yaml | 1 - data/keyboards/ch+fr.yaml | 1 - data/keyboards/ch+fr_wide.yaml | 1 - data/keyboards/ch.yaml | 1 - data/keyboards/ch_wide.yaml | 1 - data/keyboards/de.yaml | 1 - data/keyboards/de_wide.yaml | 1 - data/keyboards/email/us.yaml | 1 - data/keyboards/email/us_wide.yaml | 1 - data/keyboards/epo.yaml | 3 +-- data/keyboards/epo_wide.yaml | 3 +-- data/keyboards/es+cat.yaml | 2 +- data/keyboards/es+cat_wide.yaml | 2 +- data/keyboards/es.yaml | 2 +- data/keyboards/es_wide.yaml | 2 +- data/keyboards/hu.yaml | 2 -- data/keyboards/hu_wide.yaml | 2 -- data/keyboards/it+fur.yaml | 1 - data/keyboards/it+fur_wide.yaml | 1 - data/keyboards/it.yaml | 1 - data/keyboards/it_wide.yaml | 1 - data/keyboards/jp+kana.yaml | 1 - data/keyboards/jp+kana_wide.yaml | 1 - data/keyboards/number/us.yaml | 4 ++-- data/keyboards/number/us_wide.yaml | 4 ++-- data/keyboards/ro.yaml | 2 +- data/keyboards/ro_wide.yaml | 2 +- data/keyboards/se.yaml | 2 +- data/keyboards/se_wide.yaml | 2 +- data/keyboards/terminal/fr+bepo.yaml | 5 ++--- data/keyboards/terminal/fr+bepo_wide.yaml | 1 - data/keyboards/terminal/us.yaml | 2 +- data/keyboards/terminal/us_wide.yaml | 2 +- data/keyboards/url/us.yaml | 1 - data/keyboards/url/us_wide.yaml | 1 - 38 files changed, 18 insertions(+), 46 deletions(-) diff --git a/data/keyboards/ara.yaml b/data/keyboards/ara.yaml index c6b330b5..47a641e6 100644 --- a/data/keyboards/ara.yaml +++ b/data/keyboards/ara.yaml @@ -64,7 +64,6 @@ buttons: label: "*/=" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/ara_wide.yaml b/data/keyboards/ara_wide.yaml index 25136c90..9c62e54e 100644 --- a/data/keyboards/ara_wide.yaml +++ b/data/keyboards/ara_wide.yaml @@ -64,7 +64,6 @@ buttons: label: "*/=" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/ch+de.yaml b/data/keyboards/ch+de.yaml index 7c738b0f..db9ba804 100644 --- a/data/keyboards/ch+de.yaml +++ b/data/keyboards/ch+de.yaml @@ -65,7 +65,6 @@ buttons: label: "*/=" space: outline: "spaceline" - label: " " text: " " Return: outline: "wide" diff --git a/data/keyboards/ch+de_wide.yaml b/data/keyboards/ch+de_wide.yaml index d208e36e..4e6b5003 100644 --- a/data/keyboards/ch+de_wide.yaml +++ b/data/keyboards/ch+de_wide.yaml @@ -65,7 +65,6 @@ buttons: label: "*/=" space: outline: "spaceline" - label: " " text: " " Return: outline: "wide" diff --git a/data/keyboards/ch+fr.yaml b/data/keyboards/ch+fr.yaml index 353e65af..3e1180c5 100644 --- a/data/keyboards/ch+fr.yaml +++ b/data/keyboards/ch+fr.yaml @@ -76,7 +76,6 @@ buttons: label: "Ââ" space: outline: "spaceline" - label: " " text: " " Return: outline: "wide" diff --git a/data/keyboards/ch+fr_wide.yaml b/data/keyboards/ch+fr_wide.yaml index 0b1dc8b2..3909eae9 100644 --- a/data/keyboards/ch+fr_wide.yaml +++ b/data/keyboards/ch+fr_wide.yaml @@ -76,7 +76,6 @@ buttons: label: "Ââ" space: outline: "spaceline" - label: " " text: " " Return: outline: "wide" diff --git a/data/keyboards/ch.yaml b/data/keyboards/ch.yaml index 6bcd212b..d50e6de9 100644 --- a/data/keyboards/ch.yaml +++ b/data/keyboards/ch.yaml @@ -79,7 +79,6 @@ buttons: label: "Ââ" Space: outline: "spaceline" - label: " " text: " " Return: outline: "wide" diff --git a/data/keyboards/ch_wide.yaml b/data/keyboards/ch_wide.yaml index 86d5a8ae..b2fd0160 100644 --- a/data/keyboards/ch_wide.yaml +++ b/data/keyboards/ch_wide.yaml @@ -81,7 +81,6 @@ buttons: label: "Ââ" Space: outline: "spaceline" - label: " " text: " " Return: outline: "wide" diff --git a/data/keyboards/de.yaml b/data/keyboards/de.yaml index c2a6e500..6febbc95 100644 --- a/data/keyboards/de.yaml +++ b/data/keyboards/de.yaml @@ -4,7 +4,6 @@ outlines: subtle-highlight: { width: 35.33, height: 52 } altline: { width: 52.67, height: 52 } change-view: { width: 52.67, height: 52 } - wide: { width: 62, height: 52 } spaceline: { width: 89.3, height: 52 } special: { width: 35.33, height: 52 } diff --git a/data/keyboards/de_wide.yaml b/data/keyboards/de_wide.yaml index a7ca8e51..b59717f5 100644 --- a/data/keyboards/de_wide.yaml +++ b/data/keyboards/de_wide.yaml @@ -7,7 +7,6 @@ outlines: narrow: { width: 40.5, height: 42 } altline: { width: 81, height: 42 } change-view: { width: 81, height: 42 } - wide: { width: 108, height: 42 } spaceline: { width: 156, height: 42 } special: { width: 48, height: 42 } diff --git a/data/keyboards/email/us.yaml b/data/keyboards/email/us.yaml index 38063eec..cb9d41cb 100644 --- a/data/keyboards/email/us.yaml +++ b/data/keyboards/email/us.yaml @@ -1,7 +1,6 @@ --- outlines: default: { width: 35.33, 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 } diff --git a/data/keyboards/email/us_wide.yaml b/data/keyboards/email/us_wide.yaml index a022f63b..3bc6ed14 100644 --- a/data/keyboards/email/us_wide.yaml +++ b/data/keyboards/email/us_wide.yaml @@ -1,7 +1,6 @@ --- outlines: default: { width: 52, height: 42 } - altline: { width: 77.52, height: 42 } wide: { width: 91.25, height: 42 } change-view: { width: 77.52, height: 42 } change-view-2: { width: 91.25, height: 42 } diff --git a/data/keyboards/epo.yaml b/data/keyboards/epo.yaml index 2d21b9cf..be295ed5 100644 --- a/data/keyboards/epo.yaml +++ b/data/keyboards/epo.yaml @@ -72,10 +72,9 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "ŭŜ" + label: "Ŝŭ" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/epo_wide.yaml b/data/keyboards/epo_wide.yaml index f5e5ec16..3271324a 100644 --- a/data/keyboards/epo_wide.yaml +++ b/data/keyboards/epo_wide.yaml @@ -72,10 +72,9 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "ŭŜ" + label: "Ŝŭ" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/es+cat.yaml b/data/keyboards/es+cat.yaml index df7b4953..fce336d7 100644 --- a/data/keyboards/es+cat.yaml +++ b/data/keyboards/es+cat.yaml @@ -72,7 +72,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "àÀ" + label: "Àà" space: outline: "spaceline" text: " " diff --git a/data/keyboards/es+cat_wide.yaml b/data/keyboards/es+cat_wide.yaml index 664c1a50..61312896 100644 --- a/data/keyboards/es+cat_wide.yaml +++ b/data/keyboards/es+cat_wide.yaml @@ -72,7 +72,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "àÀ" + label: "Àà" space: outline: "spaceline" text: " " diff --git a/data/keyboards/es.yaml b/data/keyboards/es.yaml index dbd21ae0..1691691f 100644 --- a/data/keyboards/es.yaml +++ b/data/keyboards/es.yaml @@ -72,7 +72,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "áÁ" + label: "Áá" space: outline: "spaceline" text: " " diff --git a/data/keyboards/es_wide.yaml b/data/keyboards/es_wide.yaml index 719c1542..c4014f9a 100644 --- a/data/keyboards/es_wide.yaml +++ b/data/keyboards/es_wide.yaml @@ -72,7 +72,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "áÁ" + label: "Áá" space: outline: "spaceline" text: " " diff --git a/data/keyboards/hu.yaml b/data/keyboards/hu.yaml index ce72d1c1..4189c508 100644 --- a/data/keyboards/hu.yaml +++ b/data/keyboards/hu.yaml @@ -3,7 +3,6 @@ outlines: default: { width: 35.33, 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: 99.67, height: 52 } @@ -76,7 +75,6 @@ buttons: label: "éá" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/hu_wide.yaml b/data/keyboards/hu_wide.yaml index 8b90d00c..641f4910 100644 --- a/data/keyboards/hu_wide.yaml +++ b/data/keyboards/hu_wide.yaml @@ -3,7 +3,6 @@ outlines: default: { width: 48, height: 42 } altline: { width: 81, height: 42 } - wide: { width: 108, height: 42 } change-view: { width: 81, height: 42 } change-view-2: { width: 108, height: 42 } spaceline: { width: 216, height: 42 } @@ -76,7 +75,6 @@ buttons: label: "éá" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/it+fur.yaml b/data/keyboards/it+fur.yaml index b04d450c..3dcb076f 100644 --- a/data/keyboards/it+fur.yaml +++ b/data/keyboards/it+fur.yaml @@ -77,7 +77,6 @@ buttons: label: "àê" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/it+fur_wide.yaml b/data/keyboards/it+fur_wide.yaml index f4480614..ee6390f8 100644 --- a/data/keyboards/it+fur_wide.yaml +++ b/data/keyboards/it+fur_wide.yaml @@ -77,7 +77,6 @@ buttons: label: "àê" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/it.yaml b/data/keyboards/it.yaml index b7338ed3..94636cbc 100644 --- a/data/keyboards/it.yaml +++ b/data/keyboards/it.yaml @@ -77,7 +77,6 @@ buttons: label: "àè" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/it_wide.yaml b/data/keyboards/it_wide.yaml index 634f7849..e385af74 100644 --- a/data/keyboards/it_wide.yaml +++ b/data/keyboards/it_wide.yaml @@ -77,7 +77,6 @@ buttons: label: "àè" space: outline: "spaceline" - label: " " text: " " Return: outline: "altline" diff --git a/data/keyboards/jp+kana.yaml b/data/keyboards/jp+kana.yaml index 4e3ed4f1..f5bcab71 100644 --- a/data/keyboards/jp+kana.yaml +++ b/data/keyboards/jp+kana.yaml @@ -3,7 +3,6 @@ outlines: default: { width: 62, height: 52 } default-wide: { width: 62, height: 52 } - altline: { width: 62, height: 52 } wide: { width: 62, height: 52 } change-view: { width: 62, height: 52 } change-view-2: { width: 62, height: 52 } diff --git a/data/keyboards/jp+kana_wide.yaml b/data/keyboards/jp+kana_wide.yaml index 9f7f7549..e64b0859 100644 --- a/data/keyboards/jp+kana_wide.yaml +++ b/data/keyboards/jp+kana_wide.yaml @@ -3,7 +3,6 @@ outlines: default: { width: 62, height: 42 } default-wide: { width: 62, height: 42 } - altline: { width: 62, height: 42 } wide: { width: 62, height: 42 } change-view: { width: 62, height: 42 } change-view-2: { width: 62, height: 42 } diff --git a/data/keyboards/number/us.yaml b/data/keyboards/number/us.yaml index 1229d6a8..9965ac3b 100644 --- a/data/keyboards/number/us.yaml +++ b/data/keyboards/number/us.yaml @@ -2,7 +2,7 @@ outlines: default: { width: 37.46341, height: 52 } altline: { width: 48.39024, height: 52 } - outline7: { width: 88.97561, height: 52 } + wide: { width: 88.97561, height: 52 } spaceline: { width: 120.5853, height: 52 } views: @@ -21,7 +21,7 @@ buttons: outline: "spaceline" text: " " Return: - outline: "outline7" + outline: "wide" icon: "key-enter" keysym: "Return" asterisk: diff --git a/data/keyboards/number/us_wide.yaml b/data/keyboards/number/us_wide.yaml index ef78cb2b..dabb0515 100644 --- a/data/keyboards/number/us_wide.yaml +++ b/data/keyboards/number/us_wide.yaml @@ -2,7 +2,7 @@ outlines: default: { width: 37.46341, height: 42 } altline: { width: 48.39024, height: 42 } - outline7: { width: 88.97561, height: 42 } + wide: { width: 88.97561, height: 42 } spaceline: { width: 120.5853, height: 42 } views: @@ -21,7 +21,7 @@ buttons: outline: "spaceline" text: " " Return: - outline: "outline7" + outline: "wide" icon: "key-enter" keysym: "Return" asterisk: diff --git a/data/keyboards/ro.yaml b/data/keyboards/ro.yaml index ac031173..a2321028 100644 --- a/data/keyboards/ro.yaml +++ b/data/keyboards/ro.yaml @@ -72,7 +72,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "ăĂ" + label: "Ăă" space: outline: "spaceline" text: " " diff --git a/data/keyboards/ro_wide.yaml b/data/keyboards/ro_wide.yaml index f33f2e16..27483dbe 100644 --- a/data/keyboards/ro_wide.yaml +++ b/data/keyboards/ro_wide.yaml @@ -72,7 +72,7 @@ buttons: lock_view: "eschars" unlock_view: "base" outline: "change-view" - label: "ăĂ" + label: "Ăă" space: outline: "spaceline" text: " " diff --git a/data/keyboards/se.yaml b/data/keyboards/se.yaml index 164b7ac4..3fbd9ac9 100644 --- a/data/keyboards/se.yaml +++ b/data/keyboards/se.yaml @@ -48,9 +48,9 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - outline: "change-view-2" action: set_view: "numbers" + outline: "change-view-2" label: "123" show_numbers_from_symbols: action: diff --git a/data/keyboards/se_wide.yaml b/data/keyboards/se_wide.yaml index 62db411d..00d28efb 100644 --- a/data/keyboards/se_wide.yaml +++ b/data/keyboards/se_wide.yaml @@ -48,9 +48,9 @@ buttons: outline: "special" icon: "keyboard-mode-symbolic" show_numbers: - outline: "change-view-2" action: set_view: "numbers" + outline: "change-view-2" label: "123" show_numbers_from_symbols: action: diff --git a/data/keyboards/terminal/fr+bepo.yaml b/data/keyboards/terminal/fr+bepo.yaml index 71035f0b..a38e1089 100644 --- a/data/keyboards/terminal/fr+bepo.yaml +++ b/data/keyboards/terminal/fr+bepo.yaml @@ -2,14 +2,13 @@ outlines: default: { width: 35.33, height: 46 } halfwidth: { width: 17.665, height: 46 } + narrow: { width: 22.5, height: 46 } + special: { width: 35.33, height: 46 } change-view: { width: 42, height: 46 } change-view-2: { width: 50, height: 46 } action: { width: 59, height: 46 } - altline: { width: 42, height: 46 } wide: { width: 50, height: 46 } - narrow: { width: 22.5, height: 46 } spaceline: { width: 119.47, height: 46 } - special: { width: 35.33, height: 46 } small: { width: 50.471, height: 22 } views: diff --git a/data/keyboards/terminal/fr+bepo_wide.yaml b/data/keyboards/terminal/fr+bepo_wide.yaml index 5de97dec..010c58b1 100644 --- a/data/keyboards/terminal/fr+bepo_wide.yaml +++ b/data/keyboards/terminal/fr+bepo_wide.yaml @@ -4,7 +4,6 @@ outlines: halfwidth: { width: 27, height: 37 } narrow: { width: 40.5, height: 37 } special: { width: 54, height: 37 } - altline: { width: 81, height: 37 } change-view: { width: 81, height: 37 } large: { width: 81, height: 37 } action: { width: 90, height: 37 } diff --git a/data/keyboards/terminal/us.yaml b/data/keyboards/terminal/us.yaml index 3698f7c8..7ec4ee26 100644 --- a/data/keyboards/terminal/us.yaml +++ b/data/keyboards/terminal/us.yaml @@ -36,7 +36,7 @@ views: - "TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` · √ π τ ÷ × ¶ @" - "© ® £ € ¥ ^ ° { }" - - "show_numbers % | < > = [ ] BackSpace" + - "show_numbers % | < > = [ ] BackSpace" - "show_letters preferences space . Return" actions: - "TabSmall Ctrl Alt PageUp PageDown Home End" diff --git a/data/keyboards/terminal/us_wide.yaml b/data/keyboards/terminal/us_wide.yaml index 609a3fa2..9c1fe836 100644 --- a/data/keyboards/terminal/us_wide.yaml +++ b/data/keyboards/terminal/us_wide.yaml @@ -36,7 +36,7 @@ views: - "EscSmall TabSmall Ctrl Alt ↑ ↓ ← →" - "~ ` · √ π τ ÷ × ¶ @" - "© ® £ € ¥ ^ ° { }" - - "show_numbers % | < > = [ ] BackSpace" + - "show_numbers % | < > = [ ] BackSpace" - "show_letters preferences space . Return" actions: - "EscSmall TabSmall Ctrl Alt PageUp PageDown Home End" diff --git a/data/keyboards/url/us.yaml b/data/keyboards/url/us.yaml index e26877ea..5ad18ecf 100644 --- a/data/keyboards/url/us.yaml +++ b/data/keyboards/url/us.yaml @@ -1,7 +1,6 @@ --- outlines: default: { width: 35.33, 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 } diff --git a/data/keyboards/url/us_wide.yaml b/data/keyboards/url/us_wide.yaml index 8acde814..cbd41193 100644 --- a/data/keyboards/url/us_wide.yaml +++ b/data/keyboards/url/us_wide.yaml @@ -1,7 +1,6 @@ --- outlines: default: { width: 52, height: 42 } - altline: { width: 77.52, height: 42 } wide: { width: 91.25, height: 42 } change-view: { width: 77.52, height: 42 } change-view-2: { width: 91.25, height: 42 }