From e07343478159047dbeb3c54fbe46aff58319b19b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20J=C3=B6rg?= Date: Mon, 31 May 2021 19:09:26 +0000 Subject: [PATCH 1/3] Introduce Swiss German keyboard layout --- data/keyboards/ch.yaml | 93 ++++++++++++++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 1 + 3 files changed, 95 insertions(+) create mode 100644 data/keyboards/ch.yaml diff --git a/data/keyboards/ch.yaml b/data/keyboards/ch.yaml new file mode 100644 index 00000000..bc7c2acb --- /dev/null +++ b/data/keyboards/ch.yaml @@ -0,0 +1,93 @@ +# Maintained by: Patrick Jörg . No Copyright, enjoy! +# Thankfully copied from: Jordi Bossy . + +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 48, height: 52 } + wide: { width: 59, height: 52 } + spaceline: { width: 70, height: 52 } + special: { width: 28, height: 52 } + +views: + base: + - "q w e r t z u i o p ü" + - "a s d f g h j k l ö ä" + - "Shift_L y x c v b n m BackSpace" + - "show_numbers show_eschars preferences ' space , . Return" + upper: + - "Q W E R T Z U I O P Ü" + - "A S D F G H J K L Ö Ä" + - "Shift_L Y X C V B N M BackSpace" + - "show_numbers show_eschars preferences \" space , . Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ * + - = ( ) ~ < >" + - "show_symbols # & / \\ √ ; : BackSpace" + - "show_letters show_eschars preferences _ space , . Return" + symbols: + - "€ $ £ ¥ % | § µ [ ]" + - "© ® § ` ^ { } · ¡ ¿" + - "show_numbers « » ÷ × “ ” „ BackSpace" + - "show_letters show_eschars preferences - space , . Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers æ œ ä ë ï ö ü BackSpace" + - "show_letters_from_accents preferences ñ Ñ space ° ß 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: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "altline" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + show_letters_from_accents: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + label: " " + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + "\"": + keysym: "quotedbl" diff --git a/src/resources.rs b/src/resources.rs index 3daf453f..fe3fbb55 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -29,6 +29,7 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("br", include_str!("../data/keyboards/br.yaml")), ("ch+fr", include_str!("../data/keyboards/ch+fr.yaml")), + ("ch", include_str!("../data/keyboards/ch.yaml")), ("de", include_str!("../data/keyboards/de.yaml")), ("de_wide", include_str!("../data/keyboards/de_wide.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 2079d55f..4eab8a27 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -63,6 +63,7 @@ foreach layout : [ 'bg', 'br', 'ch+fr', + 'ch', 'cz', 'cz_wide', 'cz+qwerty', 'cz+qwerty_wide', 'de', 'de_wide', From 6409ff374848d0cd2cb105028867669004929911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20J=C3=B6rg?= Date: Tue, 8 Jun 2021 17:06:36 +0000 Subject: [PATCH 2/3] Introducing ch+de layout and modified ch.yaml fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Autor: Patrick Jörg --- data/keyboards/ch+de.yaml | 73 +++++++++++++++++++++++++++++++++++++++ data/keyboards/ch.yaml | 6 ++-- src/resources.rs | 1 + tests/meson.build | 1 + 4 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 data/keyboards/ch+de.yaml diff --git a/data/keyboards/ch+de.yaml b/data/keyboards/ch+de.yaml new file mode 100644 index 00000000..9ae5ad16 --- /dev/null +++ b/data/keyboards/ch+de.yaml @@ -0,0 +1,73 @@ +# Maintained by Patrick Jörg . No Copyright, enjoy! + +--- +outlines: + default: { width: 35.33, height: 52 } + altline: { width: 48, height: 52 } + wide: { width: 59, height: 52 } + spaceline: { width: 70, height: 52 } + special: { width: 28, height: 52 } + +views: + base: + - "q w e r t z u i o p ü" + - "a s d f g h j k l ö ä" + - "Shift_L y x c v b n m BackSpace" + - "show_numbers ? ! preferences ' space , . Return" + upper: + - "Q W E R T Z U I O P Ü" + - "A S D F G H J K L Ö Ä" + - "Shift_L Y X C V B N M BackSpace" + - "show_numbers - _ preferences \" space , . Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ * + - = ( ) ~ < >" + - "show_symbols # & / \\ √ ; : BackSpace" + - "show_letters ? ! preferences _ space , . Return" + symbols: + - "€ $ £ ¥ % | § µ [ ]" + - "© ® § ` ^ { } · ¡ ¿" + - "show_numbers « » ÷ × “ ” „ BackSpace" + - "show_letters preferences - space , . 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: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "altline" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + space: + outline: "spaceline" + label: " " + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + "\"": + keysym: "quotedbl" diff --git a/data/keyboards/ch.yaml b/data/keyboards/ch.yaml index bc7c2acb..87e14c51 100644 --- a/data/keyboards/ch.yaml +++ b/data/keyboards/ch.yaml @@ -1,5 +1,5 @@ -# Maintained by: Patrick Jörg . No Copyright, enjoy! -# Thankfully copied from: Jordi Bossy . +# Maintained by: Jordy Bossy +# and Patrick Jörg . No Copyright, enjoy! --- outlines: @@ -22,7 +22,7 @@ views: - "show_numbers show_eschars preferences \" space , . Return" numbers: - "1 2 3 4 5 6 7 8 9 0" - - "@ * + - = ( ) ~ < >" + - "@ * + - = ( ) ~ < > ? !" - "show_symbols # & / \\ √ ; : BackSpace" - "show_letters show_eschars preferences _ space , . Return" symbols: diff --git a/src/resources.rs b/src/resources.rs index fe3fbb55..6ee0af7e 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -29,6 +29,7 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("br", include_str!("../data/keyboards/br.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")), ("de", include_str!("../data/keyboards/de.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 4eab8a27..54ae0d4e 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -63,6 +63,7 @@ foreach layout : [ 'bg', 'br', 'ch+fr', + 'ch+de', 'ch', 'cz', 'cz_wide', 'cz+qwerty', 'cz+qwerty_wide', From cce1f6b81754b0549b0a3fa03201e694bd8072fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20J=C3=B6rg?= Date: Sun, 27 Jun 2021 19:04:07 +0200 Subject: [PATCH 3/3] Added ch_wide --- data/keyboards/ch_wide.yaml | 93 +++++++++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 2 +- 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 data/keyboards/ch_wide.yaml diff --git a/data/keyboards/ch_wide.yaml b/data/keyboards/ch_wide.yaml new file mode 100644 index 00000000..c37f4b28 --- /dev/null +++ b/data/keyboards/ch_wide.yaml @@ -0,0 +1,93 @@ +# Maintained by: Jordy Bossy +# and Patrick Jörg . No Copyright, enjoy! + +--- +outlines: + default: { width: 48, height: 42 } + altline: { width: 81, height: 42 } + wide: { width: 108, height: 42 } + spaceline: { width: 216, height: 42 } + special: { width: 48, height: 42 } + +views: + base: + - "q w e r t z u i o p ü" + - "a s d f g h j k l ö ä" + - "Shift_L y x c v b n m BackSpace" + - "show_numbers show_eschars preferences ' space , . Return" + upper: + - "Q W E R T Z U I O P Ü" + - "A S D F G H J K L Ö Ä" + - "Shift_L Y X C V B N M BackSpace" + - "show_numbers show_eschars preferences \" space , . Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ * + - = ( ) ~ < > ? !" + - "show_symbols # & / \\ √ ; : BackSpace" + - "show_letters show_eschars preferences _ space , . Return" + symbols: + - "€ $ £ ¥ % | § µ [ ]" + - "© ® § ` ^ { } · ¡ ¿" + - "show_numbers « » ÷ × “ ” „ BackSpace" + - "show_letters show_eschars preferences - space , . Return" + eschars: + - "à â ç é è ê î ô ù û" + - "À Â Ç É È Ê Î Ô Ù Û" + - "show_numbers æ œ ä ë ï ö ü BackSpace" + - "show_letters_from_accents preferences ñ Ñ space ° ß 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: "altline" + label: "123" + show_letters: + action: + set_view: "base" + outline: "altline" + label: "abc" + show_symbols: + action: + set_view: "symbols" + outline: "altline" + label: "*/=" + show_eschars: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "äÄ" + show_letters_from_accents: + action: + locking: + lock_view: "eschars" + unlock_view: "base" + outline: "altline" + label: "âÂ" + space: + outline: "spaceline" + label: " " + text: " " + Return: + outline: "wide" + icon: "key-enter" + keysym: "Return" + "\"": + keysym: "quotedbl" diff --git a/src/resources.rs b/src/resources.rs index 6ee0af7e..4e13ac1b 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -31,6 +31,7 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("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")), + ("ch_wide", include_str!("../data/keyboards/ch_wide.yaml")), ("de", include_str!("../data/keyboards/de.yaml")), ("de_wide", include_str!("../data/keyboards/de_wide.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 54ae0d4e..a872174a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -64,7 +64,7 @@ foreach layout : [ 'br', 'ch+fr', 'ch+de', - 'ch', + 'ch', 'ch_wide', 'cz', 'cz_wide', 'cz+qwerty', 'cz+qwerty_wide', 'de', 'de_wide',