From 4357052fe71cdeb56a9d6b8b8cde0609e8719251 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 30 Sep 2020 15:42:31 +0200 Subject: [PATCH 1/2] proposal for belgian layout (copy of fr) --- data/keyboards/be.yaml | 89 ++++++++++++++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 1 + 3 files changed, 91 insertions(+) create mode 100644 data/keyboards/be.yaml diff --git a/data/keyboards/be.yaml b/data/keyboards/be.yaml new file mode 100644 index 00000000..ab43116f --- /dev/null +++ b/data/keyboards/be.yaml @@ -0,0 +1,89 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 59, height: 52 } + spaceline: { width: 140, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "a z e r t y u i o p" + - "q s d f g h j k l m" + - "Shift_L w x c v b n . BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "A Z E R T Y U I O P" + - "Q S D F G H J K L M" + - "Shift_L W X C V B N , BackSpace" + - "show_numbers preferences space show_eschars Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? BackSpace" + - "show_letters preferences space show_eschars Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] BackSpace" + - "show_letters preferences space show_eschars Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers_from_symbols æ œ ä ë ï ö ü BackSpace" + - "show_letters preferences space show_eschars Return" + +buttons: + Shift_L: + action: + locking: + lock_view: "upper" + unlock_view: "base" + outline: "altline" + 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: "wide" + label: "123" + show_numbers_from_symbols: + action: + set_view: "numbers" + outline: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "wide" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + "\"": + keysym: "quotedbl" diff --git a/src/resources.rs b/src/resources.rs index 67a2af00..1a76540d 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -22,6 +22,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[ ("es", include_str!("../data/keyboards/es.yaml")), ("fi", include_str!("../data/keyboards/fi.yaml")), ("fr", include_str!("../data/keyboards/fr.yaml")), + ("be", include_str!("../data/keyboards/be.yaml")), ("gr", include_str!("../data/keyboards/gr.yaml")), ("it", include_str!("../data/keyboards/it.yaml")), ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 6648c492..10fb45af 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -55,6 +55,7 @@ foreach layout : [ 'es', 'fi', 'fr', + 'be', 'gr', 'it', 'jp+kana','jp+kana_wide', From 72bd26506527e1dee50f248f9373b91736552858 Mon Sep 17 00:00:00 2001 From: Al Date: Thu, 1 Oct 2020 14:54:22 +0200 Subject: [PATCH 2/2] alphabetical order for src/resources.rs tests/meson.build --- src/resources.rs | 2 +- tests/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources.rs b/src/resources.rs index 1a76540d..ed446e55 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -17,12 +17,12 @@ const KEYBOARDS: &[(*const str, *const str)] = &[ ("us_wide", include_str!("../data/keyboards/us_wide.yaml")), ("br", include_str!("../data/keyboards/br.yaml")), ("de", include_str!("../data/keyboards/de.yaml")), + ("be", include_str!("../data/keyboards/be.yaml")), ("de_wide", include_str!("../data/keyboards/de_wide.yaml")), ("dk", include_str!("../data/keyboards/dk.yaml")), ("es", include_str!("../data/keyboards/es.yaml")), ("fi", include_str!("../data/keyboards/fi.yaml")), ("fr", include_str!("../data/keyboards/fr.yaml")), - ("be", include_str!("../data/keyboards/be.yaml")), ("gr", include_str!("../data/keyboards/gr.yaml")), ("it", include_str!("../data/keyboards/it.yaml")), ("jp+kana", include_str!("../data/keyboards/jp+kana.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 10fb45af..66e00128 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -50,12 +50,12 @@ endforeach foreach layout : [ 'us', 'us_wide', 'br', + 'be', 'de', 'de_wide', 'dk', 'es', 'fi', 'fr', - 'be', 'gr', 'it', 'jp+kana','jp+kana_wide',