From 8d96803e9155b036858d0710ad4d5336c681f9db Mon Sep 17 00:00:00 2001 From: Luciano Date: Mon, 29 Jan 2024 21:41:09 +0100 Subject: [PATCH] add french canadian layout (QWERTY + accented letters) --- data/keyboards/ca.yaml | 93 ++++++++++++++++++++++++++++++++++++++++++ src/resources.rs | 2 + tests/meson.build | 1 + 3 files changed, 96 insertions(+) create mode 100644 data/keyboards/ca.yaml diff --git a/data/keyboards/ca.yaml b/data/keyboards/ca.yaml new file mode 100644 index 00000000..55657e11 --- /dev/null +++ b/data/keyboards/ca.yaml @@ -0,0 +1,93 @@ +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 52.67, height: 52 } + wide: { width: 62, height: 52 } + spaceline: { width: 142, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "q w e r t y u i o p" + - "a s d f g h j k l" + - "Shift_L z x c v b n m BackSpace" + - "show_numbers preferences space show_eschars Return" + upper: + - "Q W E R T Y U I O P" + - "A S D F G H J K L" + - "Shift_L Z X C V B N M 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: "âÂ" + period: + outline: "special" + text: "." + space: + outline: "spaceline" + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + colon: + text: ":" + + + diff --git a/src/resources.rs b/src/resources.rs index 7ac8e23c..7dea82ea 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -27,6 +27,8 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("br", include_str!("../data/keyboards/br.yaml")), + ("ca", include_str!("../data/keyboards/ca.yaml")), + ("ch+fr", include_str!("../data/keyboards/ch+fr.yaml")), ("ch+de", include_str!("../data/keyboards/ch+de.yaml")), ("ch", include_str!("../data/keyboards/ch.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 67fea2b0..8c3b7108 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -64,6 +64,7 @@ foreach layout : [ 'bg', 'bg+phonetic', 'br', + 'ca', 'ch+fr', 'ch+de', 'ch', 'ch_wide',