From 389aedac8d84063f39b589d575dd5053f92bf55e Mon Sep 17 00:00:00 2001 From: Plamen Stoev Date: Wed, 26 May 2021 08:04:44 +0300 Subject: [PATCH 1/3] Rename bg to bg+phonetic The 'bg' layout is actually the 'bg+phonetic' layout. Mark it as such. --- data/keyboards/{bg.yaml => bg+phonetic.yaml} | 0 src/resources.rs | 2 +- tests/meson.build | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename data/keyboards/{bg.yaml => bg+phonetic.yaml} (100%) diff --git a/data/keyboards/bg.yaml b/data/keyboards/bg+phonetic.yaml similarity index 100% rename from data/keyboards/bg.yaml rename to data/keyboards/bg+phonetic.yaml diff --git a/src/resources.rs b/src/resources.rs index 3daf453f..1f5e590c 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -24,7 +24,7 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("be", include_str!("../data/keyboards/be.yaml")), ("be_wide", include_str!("../data/keyboards/be_wide.yaml")), - ("bg", include_str!("../data/keyboards/bg.yaml")), + ("bg+phonetic", include_str!("../data/keyboards/bg+phonetic.yaml")), ("br", include_str!("../data/keyboards/br.yaml")), diff --git a/tests/meson.build b/tests/meson.build index 2079d55f..adf5273b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -60,7 +60,7 @@ foreach layout : [ # Block: Languages 'ara', 'ara_wide', 'be', 'be_wide', - 'bg', + 'bg+phonetic', 'br', 'ch+fr', 'cz', 'cz_wide', From 5c5475d5082a25dad826a4ac9f4a3a0c3dcc50f8 Mon Sep 17 00:00:00 2001 From: Plamen Stoev Date: Wed, 26 May 2021 08:12:25 +0300 Subject: [PATCH 2/3] Add 'bg' layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the Bulgarian (BDS) layout. I took the liberty to remove "э" from the layout, as it is not part of the Bulgarian alphabet and it was left there for historical reasons, also not to mess with the layouts for physical keyboards. Removing it gives more space for the shift_l and backspace keys. I've also added the letter "small i with grave" to the special symbols, as it is occasionally used in Bulgarian. --- data/keyboards/bg.yaml | 78 ++++++++++++++++++++++++++++++++++++++++++ src/resources.rs | 1 + tests/meson.build | 1 + 3 files changed, 80 insertions(+) create mode 100644 data/keyboards/bg.yaml diff --git a/data/keyboards/bg.yaml b/data/keyboards/bg.yaml new file mode 100644 index 00000000..d9a14bd1 --- /dev/null +++ b/data/keyboards/bg.yaml @@ -0,0 +1,78 @@ +--- +outlines: + default: { width: 32.72, height: 52 } + altline: { width: 47, height: 52 } + wide: { width: 49.09, height: 52 } + spaceline: { width: 185, height: 52 } + special: { width: 44, height: 52 } + +views: + base: + - "у е и ш щ к с д з ц б" + - "ь я а о ж г т н в м ч" + - "Shift_L ю й ъ ф х п р л BackSpace" + - "show_numbers preferences space . Return" + upper: + - "У Е И Ш Щ К С Д З Ц Б" + - "Ь Я А О Ж Г Т Н В М Ч" + - "Shift_L Ю Й Ъ Ф Х П Р Л BackSpace" + - "show_numbers preferences space , Return" + numbers: + - "1 2 3 4 5 6 7 8 9 0" + - "@ # € % & - _ + ( )" + - "show_symbols , \" ' colon ; ! ? ѝ BackSpace" + - "show_letters preferences space Return" + symbols: + - "~ ` | · √ π τ ÷ × ¶" + - "© ® £ $ ¥ ^ ° * { }" + - "show_numbers_from_symbols \\ / < > = [ ] 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: "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: "*/=" + 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 1f5e590c..431b3dd3 100644 --- a/src/resources.rs +++ b/src/resources.rs @@ -24,6 +24,7 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[ ("be", include_str!("../data/keyboards/be.yaml")), ("be_wide", include_str!("../data/keyboards/be_wide.yaml")), + ("bg", include_str!("../data/keyboards/bg.yaml")), ("bg+phonetic", include_str!("../data/keyboards/bg+phonetic.yaml")), ("br", include_str!("../data/keyboards/br.yaml")), diff --git a/tests/meson.build b/tests/meson.build index adf5273b..16673fbb 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -60,6 +60,7 @@ foreach layout : [ # Block: Languages 'ara', 'ara_wide', 'be', 'be_wide', + 'bg', 'bg+phonetic', 'br', 'ch+fr', From 3a1ea690065daf7008bd8d8c2b8a5cb70d904db6 Mon Sep 17 00:00:00 2001 From: Plamen Stoev Date: Wed, 26 May 2021 08:26:48 +0300 Subject: [PATCH 3/3] Translate more layout names in Bulgarian --- data/langs/bg-BG.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/data/langs/bg-BG.txt b/data/langs/bg-BG.txt index ce59b534..ae158a07 100644 --- a/data/langs/bg-BG.txt +++ b/data/langs/bg-BG.txt @@ -1,13 +1,22 @@ +ara Арабски +be Белгийски bg Български +br Бразилски +cz Чешки de Немски +dk Датски es Испански emoji Емоджи -fi Френски +fi Фински +fr Френски gr Гръцки -it Италянски -no Норевежки +it Италиански +jp Японски +no Норвежки pl Полски ru Руски se Шведски +th Тайски +ua Украински terminal Терминал us Английски (САЩ)