diff options
| -rw-r--r-- | AUTHORS | 160 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog | 148 | ||||
| -rw-r--r-- | NEWS | 15 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | po/ayatana-indicator-keyboard.pot | 26 | ||||
| -rw-r--r-- | po/en_GB.po | 28 | ||||
| -rw-r--r-- | po/ru.po | 12 | ||||
| -rw-r--r-- | src/service.c | 47 |
9 files changed, 304 insertions, 141 deletions
@@ -1,76 +1,84 @@ -Ács Zoltán <acszoltan111@gmail.com> -Adolfo Jayme Barrientos <fitojb@ubuntu.com> -Adrià Martín <adriamartinmor@gmail.com> -Allan LeSage <allan.lesage@canonical.com> -Allan Nordhøy <epost@anotheragency.no> -Anders Jonsson <anders.jonsson@norsjovallen.se> -Andy Chiang <andy.chiang.13@gmail.com> -bittin1ddc447d824349b2 <bittin@reimu.nl> -ButterflyOfFire <ButterflyOfFire@protonmail.com> -CI Train Bot <ci-train-bot@canonical.com> -이정희 <daemul72@gmail.com> -Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> -Eric <alchemillatruth@purelymail.com> -gallegonovato <fran-carro@hotmail.es> -Gediminas Murauskas <muziejusinfo@gmail.com> -Heimen Stoffels <vistausss@fastmail.com> -Hosted Weblate <hosted@weblate.org> -hugoalh <hugoalh@users.noreply.hosted.weblate.org> -Iain Lane <iain@orangesquash.org.uk> -Ivo Xavier <ivofernandes12@gmail.com> -Jeannette L <j.lavoie@net-c.ca> -Jeremy Bicha <jbicha@ubuntu.com> -J. Lavoie <j.lavoie@net-c.ca> -Joan CiberSheep <cibersheep@gmail.com> -Jozef Mlich <jmlich83@gmail.com> -Kevin Zhou <zzh__2020@163.com> -Kristjan Räts <kristjanrats@gmail.com> -Kristoffer Grundström <swedishsailfishosuser@tutanota.com> -Lars Uebernickel <lars.uebernickel@canonical.com> -Launchpad Translations on behalf of indicator-applet-developers <Unknown> -Luca Weiss <luca@z3ntu.xyz> -Luna Jernberg <droidbittin@gmail.com> -Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> -Matthieu Baerts <matttbe@gmail.com> -Michal Čihař <michal@cihar.com> -Mihai Moldovan <ionic@ionic.de> -Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Milan Korecky <milan.korecky@gmail.com> -Milo Ivir <mail@milotype.de> -Mohsin Ali <mohsin13089@gmail.com> -Moo <hazap@hotmail.com> -Oğuz Ersen <oguz@ersen.moe> -Oğuz Ersen <oguzersen@protonmail.com> -Oleg O Andreev <OlegOAndreev@yandex.ru> -Pavel Borecki <pavel.borecki@gmail.com> -phlostically <phlostically@mailinator.com> -Prachi Joshi <josprachi@yahoo.com> -Quentin PAGÈS <quentinantonin@free.fr> -Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org> -Reza Almanda <rezaalmanda27@gmail.com> -Robert Tari <robert@tari.in> -Sebastien Bacher <seb128@ubuntu.com> -Sergii Horichenko <m@sgg.im> -Serhii Horichenko <m@sgg.im> -Sithu Aung <sithu.aung015@gmail.com> -spnux <stephane.petrus@posteo.net> -ssantos <ssantos@web.de> -Steve <steve.kueffer.ch@gmail.com> -Sveinn í Felli <sv1@fellsnet.is> -Sylke Vicious <silkevicious@tuta.io> -Ted Gould <ted@gould.cx> -Teitei <beilaitei40@gmail.com> -Tim Lunn <tim@feathertop.org> -Tomáš Marný <tomik.marny@gmail.com> -Viktar Vauchkevich <victorenator@gmail.com> -WaldiS <admin@sto.ugu.pl> -Weblate <noreply@weblate.org> -Wellington Terumi Uemura <wellingtonuemura@gmail.com> -William Hua <william.hua@canonical.com> -WWWesten <wwwesten@gmail.com> -xiao0yy <xiao0yy@gmail.com> -Yaron Shahrabani <sh.yaron@gmail.com> -Yota321 <golamsayan@gmail.com> -Мира Странная <miraityan2004@gmail.com> -தமிழ்நேரம் <anishprabu.t@gmail.com> -复予 <clonewith@qq.com> +이정희 +Ács Zoltán +Adolfo Jayme Barrientos +Adrià Martín +Alioc +Allan LeSage +Allan Nordhøy +Anders Jonsson +Andi Chandler +Andrei Stepanov +Andy Chiang +Arif Budiman +Bittin1ddc447d824349b2 +BoneNI +ButterflyOfFire +Dmitrijs Ledkovs +DP +Eric +Gallegonovato +Gediminas Murauskas +Heimen Stoffels +Hosted Weblate +Hugoalh +Iain Lane +Ida Brenna +Iván Seoane +Ivo Xavier +Jeannette L +Jeremy Bicha +J Lavoie +Joan CiberSheep +Jozef Mlich +Kevin Zhou +Kristjan Räts +Kristoffer Grundström +Lars Uebernickel +Luca Weiss +Luna Jernberg +Marius Gripsgard +Mathieu Trudel-Lapierre +Matthieu Baerts +Michal Čihař +Mihai Moldovan +Mike Gabriel +Milan Korecky +Milo Ivir +Mohsin Ali +Moo +Oğuz Ersen +Oleg O Andreev +Pavel Borecki +Phlostically +Prachi Joshi +Priit Jõerüüt +Quentin PAGÈS +Remus-Gabriel Chelu +Reza Almanda +Ricky Tigg +Robert Tari +Sebastien Bacher +Sergii Horichenko +Serhii Horichenko +Sithu Aung +Spnux +Ssantos +Steve +Sveinn Í Felli +Sylke Vicious +Ted Gould +Teitei +Tim Lunn +Tomáš Marný +Viktar Vauchkevich +WaldiS +Weblate +Wellington Terumi Uemura +William Hua +WWWesten +Xiao0yy +Yaron Shahrabani +Yota321 +Мира Странная +தமிழ்நேரம் +复予 diff --git a/CMakeLists.txt b/CMakeLists.txt index 30fed304..0047840a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 3.13) -project (ayatana-indicator-keyboard VERSION "24.7.2" LANGUAGES C CXX) +project (ayatana-indicator-keyboard VERSION "26.6.0" LANGUAGES C CXX) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) @@ -1,6 +1,152 @@ +2026-06-10 Mike Gabriel + + * Release 26.6.0 (HEAD -> main, tag: 26.6.0) + * Merge branch + 'personal/mariogrip/fix-sections-on-hw-keyboard-change' + (1493005b) + * Merge branch 'jbicha-personal/jbicha/remove-separator' (00b8d050) + +2025-07-21 Mike Gabriel + + * src/service.c: Move 'Show Current Layout' menuitem closer HWK + settings (i.e. drop one menu separator). (03b9e52c) + +2026-06-03 Marius Gripsgard + + * Rebuild display and settings sections on hardware keyboard state + change (89a3d230) + +2026-06-01 Andrei Stepanov + + * Translated using Weblate (Russian) (aa4f9c31) + +2026-03-18 Andi Chandler + + * Translated using Weblate (English (United Kingdom)) (e8368f33) + +2026-03-09 Arif Budiman + + * Translated using Weblate (Indonesian) (abdaa3d1) + +2026-02-16 Arif Budiman + + * Translated using Weblate (Indonesian) (cbe72157) + +2026-01-27 BoneNI + + * Translated using Weblate (Lao) (5cb873f8) + +2025-12-27 Moo + + * Translated using Weblate (Lithuanian) (bcc1b704) + +2025-11-14 BoneNI + + * Translated using Weblate (Lao) (860d8ba4) + +2025-10-05 Quentin PAGÈS + + * Translated using Weblate (Occitan) (ac343372) + +2025-10-04 Oğuz Ersen + + * Translated using Weblate (Turkish) (b4baa891) + +2025-09-14 Milo Ivir + + * Translated using Weblate (Croatian) (0591dd1b) + +2025-09-01 Mike Gabriel + + * Merge branch 'sunweaver-pr/separate-sections-for-osk' (f716e013) + +2025-06-23 Mike Gabriel + + * src/keyboard-lomiri.c: For OSK layouts, update 'enabled-languages' + gsettings and move the newly selected 'active-language' to + the top. (5134db80) + +2025-06-22 Mike Gabriel + + * src/keyboard*: Remember nLayout and nLayoutOSK separately. + (a8a29623) + +2025-06-17 Robert Tari + + * Separate layout and settings for hardware and on-screen keyboards + (9c26d598) + Fixes: + https://salsa.debian.org/ubports-team/lomiri-system-settings/-/issues/20 + +2025-06-21 Robert Tari + + * .build.yml: Add libudev dependency (3f5664fd) + +2025-06-17 Robert Tari + + * debian/control: Add libudev-dev build dependency (70a39e7e) + +2025-08-25 Ida Brenna + + * Translated using Weblate (Norwegian Bokmål) (5059bcbe) + +2025-07-18 Ricky Tigg + + * Translated using Weblate (Finnish) (53824d33) + +2025-07-12 Alioc + + * Translated using Weblate (Chinese (Simplified Han script)) + (16f45c49) + +2025-06-29 DP + + * Translated using Weblate (Spanish) (76cb2a59) + +2025-05-15 Mike Gabriel + + * Merge branch 'tari01-pr/add-tecla' (d23f0fca) + +2025-05-14 Robert Tari + + * debian/control: Add tecla as a runtime dependency (0228ae33) + * Fix showing current layout on Lomiri (17394a6f) + +2025-05-07 Priit Jõerüüt + + * Translated using Weblate (Estonian) (70a3ea2b) + +2025-05-06 Yaron Shahrabani + + * Translated using Weblate (Hebrew) (6cc2d169) + +2025-04-27 தமிழ்நேரம் + + * Translated using Weblate (Tamil) (61d5994e) + +2025-04-11 bittin1ddc447d824349b2 + + * Translated using Weblate (Swedish) (5ac88c2b) + +2025-04-06 ssantos + + * Translated using Weblate (Portuguese) (e580ea73) + +2025-03-15 Jozef Mlich + + * Translated using Weblate (Czech) (161ce656) + +2025-03-11 Steve + + * Translated using Weblate (French) (6d57b283) + +2025-03-03 Serhii Horichenko + + * Translated using Weblate (Ukrainian) (f2f18606) + 2025-03-02 Mike Gabriel - * release 24.7.2 (HEAD -> main, tag: 24.7.2) + * release 24.7.2 (9c06dbd8) (tag: 24.7.2) * debian/control: Bump versioned B-D: on libayatana-common to (>= 0.9.11). (371fbc2b) @@ -1,3 +1,18 @@ +Overview of changes in ayatana-indicator-keyboard 26.6.0 + + - src/service.c: Move 'Show Current Layout' menuitem closer HWK + settings (i.e. drop one menu separator). + - Rebuild display and settings sections on hardware keyboard state + change. + - src/keyboard-lomiri.c: For OSK layouts, update 'enabled-languages' + gsettings and move the newly selected 'active-language' to the + top. + - src/keyboard*: Remember nLayout and nLayoutOSK separately. + - Separate layout and settings for hardware and on-screen keyboards. + - Fix showing current layout on Lomiri (using tecla). + - Translation updates (thanks to all contributors on + hosted.weblate.org). + Overview of changes in ayatana-indicator-keyboard 24.7.2 - CMakeLists.txt: Require libayatana-common (>= 0.9.11). diff --git a/debian/changelog b/debian/changelog index a547acb1..65cba889 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ayatana-indicator-keyboard (26.6.0) unstable; urgency=medium + + * Upstream-provided Debian package for ayatana-indicator-keyboard. See + upstream ChangeLog for recent changes. + + -- UBports developers <developers@ubports.com> Wed, 10 Jun 2026 22:57:09 +0200 + ayatana-indicator-keyboard (24.7.2-0) unstable; urgency=medium * Upstream-provided Debian package for ayatana-indicator-keyboard. diff --git a/po/ayatana-indicator-keyboard.pot b/po/ayatana-indicator-keyboard.pot index b72a4826..0ea39898 100644 --- a/po/ayatana-indicator-keyboard.pot +++ b/po/ayatana-indicator-keyboard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-23 19:05+0100\n" +"POT-Creation-Date: 2026-06-11 06:10+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -35,26 +35,34 @@ msgstr "" msgid "Show the language icon in the greeter." msgstr "" -#: src/service.c:95 +#: src/service.c:100 msgid "Keyboard" msgstr "" -#: src/service.c:96 +#: src/service.c:101 msgid "Keyboard layout switcher and settings" msgstr "" -#: src/service.c:133 +#: src/service.c:139 msgid "Current keyboard layout" msgstr "" -#: src/service.c:193 -msgid "Always show OSK" +#: src/service.c:170 +msgid "External Keyboard" msgstr "" -#: src/service.c:199 -msgid "Keyboard Settings…" +#: src/service.c:180 +msgid "On-Screen Keyboard" +msgstr "" + +#: src/service.c:248 +msgid "Always show OSK" msgstr "" -#: src/service.c:207 +#: src/service.c:281 msgid "Show Current Layout" msgstr "" + +#: src/service.c:285 +msgid "Keyboard Settings…" +msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index 2ff0c5e4..b5e04740 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,32 +8,36 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-02-23 19:05+0100\n" -"PO-Revision-Date: 2021-01-22 23:28+0100\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2026-03-19 11:09+0000\n" +"Last-Translator: Andi Chandler <andi@gowling.com>\n" +"Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/" +"ayatana-indicators/keyboard-applet/en_GB/>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.17-dev\n" #: data/org.ayatana.indicator.keyboard.gschema.xml:1 msgid "Show the language icon in desktop mode." -msgstr "" +msgstr "Show the language icon in desktop mode." #: data/org.ayatana.indicator.keyboard.gschema.xml:2 msgid "" "If enabled, the indicator shows the current layout icon. Otherwise, it " "displays a generic keyboard icon." msgstr "" +"If enabled, the indicator shows the current layout icon. Otherwise, it " +"displays a generic keyboard icon." #: data/org.ayatana.indicator.keyboard.gschema.xml:3 msgid "Show the language icon in phone mode." -msgstr "" +msgstr "Show the language icon in phone mode." #: data/org.ayatana.indicator.keyboard.gschema.xml:4 msgid "Show the language icon in the greeter." -msgstr "" +msgstr "Show the language icon in the greeter." #: src/service.c:95 msgid "Keyboard" @@ -41,7 +45,7 @@ msgstr "Keyboard" #: src/service.c:96 msgid "Keyboard layout switcher and settings" -msgstr "" +msgstr "Keyboard layout switcher and settings" #: src/service.c:133 msgid "Current keyboard layout" @@ -49,14 +53,12 @@ msgstr "Current keyboard layout" #: src/service.c:193 msgid "Always show OSK" -msgstr "" +msgstr "Always show OSK" #: src/service.c:199 -#, fuzzy msgid "Keyboard Settings…" -msgstr "Keyboard Settings..." +msgstr "Keyboard Settings…" #: src/service.c:207 -#, fuzzy msgid "Show Current Layout" -msgstr "Current keyboard layout" +msgstr "Show Current Layout" @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-02-23 19:05+0100\n" -"PO-Revision-Date: 2023-10-13 04:02+0000\n" -"Last-Translator: Serhii Horichenko <m@sgg.im>\n" +"PO-Revision-Date: 2026-06-02 04:01+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/ayatana-" "indicators/keyboard-applet/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 5.1-dev\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Weblate 2026.6\n" #: data/org.ayatana.indicator.keyboard.gschema.xml:1 msgid "Show the language icon in desktop mode." @@ -54,7 +54,7 @@ msgstr "Текущая раскладка клавиатуры" #: src/service.c:193 msgid "Always show OSK" -msgstr "" +msgstr "Всегда показывать экранную клавиатуру" #: src/service.c:199 msgid "Keyboard Settings…" diff --git a/src/service.c b/src/service.c index 123308c9..4e493676 100644 --- a/src/service.c +++ b/src/service.c @@ -43,8 +43,7 @@ enum { SECTION_HEADER = (1 << 0), SECTION_LAYOUTS = (1 << 1), - SECTION_DISPLAY = (1 << 2), - SECTION_SETTINGS = (1 << 3) + SECTION_SETTINGS = (1 << 2) }; enum @@ -242,6 +241,7 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self, gboolea { GMenu * pMenu = g_menu_new(); gboolean bUbuntuTouch = ayatana_common_utils_is_ubuntutouch (); + gboolean bDisplay = FALSE; if (self->pPrivate->bLomiri && bOSK && !bUbuntuTouch) { @@ -262,6 +262,7 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self, gboolea if (bHardwareKeyboard) { sAction = "indicator.settings"; + bDisplay = TRUE; } } else if (bOSK) @@ -272,8 +273,13 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self, gboolea else if (!bOSK) { sAction = "indicator.settings"; + bDisplay = TRUE; } + if (bDisplay) + { + g_menu_append (pMenu, _("Show Current Layout"), "indicator.display"); + } if (sAction) { g_menu_append(pMenu, _("Keyboard Settings…"), sAction); @@ -282,29 +288,6 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self, gboolea return G_MENU_MODEL(pMenu); } -static GMenuModel* createDisplaySection (IndicatorKeyboardService *self) -{ - GMenu * pMenu = g_menu_new (); - gboolean bDisplay = TRUE; - - if (self->pPrivate->bLomiri) - { - gboolean bHardwareKeyboard = m_fnKeyboardHasHardwareKeyboard (self->pPrivate->pKeyboard); - - if (!bHardwareKeyboard) - { - bDisplay = FALSE; - } - } - - if (bDisplay) - { - g_menu_append (pMenu, _("Show Current Layout"), "indicator.display"); - } - - return G_MENU_MODEL (pMenu); -} - static void rebuildSection(GMenu *pMenu, int nPos, GMenuModel *pModel) { g_menu_remove(pMenu, nPos); @@ -333,22 +316,17 @@ static void rebuildNow(IndicatorKeyboardService *self, guint nSections) if (nSections & SECTION_LAYOUTS) { rebuildSection(pInfoDesktop->pSubmenu, 0, createLayoutSection(self, HWKBD)); - rebuildSection(pInfoDesktop->pSubmenu, 3, createLayoutSection(self, OSK)); + rebuildSection(pInfoDesktop->pSubmenu, 2, createLayoutSection(self, OSK)); rebuildSection(pInfoPhone->pSubmenu, 0, createLayoutSection(self, HWKBD)); rebuildSection(pInfoPhone->pSubmenu, 2, createLayoutSection(self, OSK)); rebuildSection(pInfoGreeter->pSubmenu, 0, createLayoutSection(self, HWKBD)); rebuildSection(pInfoGreeter->pSubmenu, 1, createLayoutSection(self, OSK)); } - if (nSections & SECTION_DISPLAY) - { - rebuildSection (pInfoDesktop->pSubmenu, 1, createDisplaySection (self)); - } - if (nSections & SECTION_SETTINGS) { - rebuildSection(pInfoDesktop->pSubmenu, 2, createSettingsSection(self, HWKBD)); - rebuildSection(pInfoDesktop->pSubmenu, 4, createSettingsSection(self, OSK)); + rebuildSection(pInfoDesktop->pSubmenu, 1, createSettingsSection(self, HWKBD)); + rebuildSection(pInfoDesktop->pSubmenu, 3, createSettingsSection(self, OSK)); rebuildSection(pInfoPhone->pSubmenu, 1, createSettingsSection(self, HWKBD)); rebuildSection(pInfoPhone->pSubmenu, 3, createSettingsSection(self, OSK)); } @@ -376,7 +354,6 @@ static void createMenu(IndicatorKeyboardService *self, int nProfile) else if (nProfile == PROFILE_DESKTOP) { lSections[nSection++] = createLayoutSection(self, HWKBD); - lSections[nSection++] = createDisplaySection(self); lSections[nSection++] = createSettingsSection(self, HWKBD); lSections[nSection++] = createLayoutSection(self, OSK); lSections[nSection++] = createSettingsSection(self, OSK); @@ -422,7 +399,7 @@ static void onLayoutChanged(Keyboard *pKeyboard, gpointer pData) static void onConfigChanged(Keyboard *pKeyboard, gpointer pData) { IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE(pData); - rebuildNow(self, SECTION_LAYOUTS); + rebuildNow(self, SECTION_LAYOUTS | SECTION_DISPLAY | SECTION_SETTINGS); } static void onLayoutSelected(GSimpleAction *pAction, GVariant *pVariant, gpointer pData) |