V86: Add support for GNOME 44

Signed-off-by: Hollow Man <[email protected]>
openSUSE · Mar 7, 2023 · 959f1c2 · 959f1c2
1 parent b680b2a
commit 959f1c2
Show file tree

Hide file tree

Showing 19 changed files with 150 additions and 144 deletions.
diff --git a/.SRCINFO b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnome-shell-extension-customize-ibus
 	pkgdesc = Full customization of appearance, behavior, system tray and input source indicator for IBus.
-	pkgver = 85
+	pkgver = 86
 	pkgrel = 0
 	epoch = 0
 	url = https://extensions.gnome.org/extension/4112/customize-ibus/

diff --git a/PKGBUILD b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=gnome-shell-extension-customize-ibus
 _pkgname=Customize-IBus
 _commit=5eed0b430d40014a3b5e6b15600c7f1ef95b96d8
-pkgver=85
+pkgver=86
 pkgrel=0
 epoch=0
 pkgdesc="Full customization of appearance, behavior, system tray and input source indicator for IBus."

diff --git a/README.md b/README.md
@@ -6,9 +6,6 @@
 [![GPL Licence](https://img.shields.io/badge/license-GPL-blue)](https://opensource.org/licenses/GPL-3.0/)
 [![Repo-Size](https://img.shields.io/github/repo-size/openSUSE/Customize-IBus.svg)](https://github.com/openSUSE/Customize-IBus/archive/main.zip)
 
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/openSUSE/Customize-IBus.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openSUSE/Customize-IBus/alerts/)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/openSUSE/Customize-IBus.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openSUSE/Customize-IBus/context:javascript)
-
 ### Welcome to contribute your translation on Weblate!
 
 [![Translation Status](https://hosted.weblate.org/widgets/ibus-customize/-/287x66-grey.png)](https://hosted.weblate.org/engage/ibus-customize/)
@@ -40,7 +37,7 @@ If you use Arch Linux, you can also use AUR to install as a system extension:
 yay -S gnome-shell-extension-customize-ibus
 ```
 
-[![AUR](https://aur.archlinux.org/css/archnavbar/aurlogo.png)](https://aur.archlinux.org/packages/gnome-shell-extension-customize-ibus/)
+[![AUR](https://aur.archlinux.org/static/css/archnavbar/aurlogo.png)](https://aur.archlinux.org/packages/gnome-shell-extension-customize-ibus/)
 
 You can also use RPM Repository to install as a system extension under [Fedora](../../tree/package-repo#fedora):
 
@@ -278,8 +275,9 @@ When only the light background or dark background is turned on, the extension wi
 - [x] V83: Support for GNOME 43.
 - [x] V84: Fix to make lock screen theme get unaffected.
 - [x] V85: Fix loading theme after unlocking the screen.
+- [x] V86: Add support for GNOME 44.
 
-Tested on Fedora, OpenSUSE, Manjaro, Ubuntu and FreeBSD, GNOME-shell [3.38](../../tree/3.38)(v3, v5, v9, v11, v14, v15, v17, v19, v21, v23, v25, v27, v29, v31, v35, v37, v39, v41, v43, v45, v47, v49, v51, v53(merged into main in later version)), 40.0(v4, v8, v10, v12, v13, v16, v18, v20, v22, v24, v26, v28, v30, v32, v36, v38, v40, v42, v44, v46, v48, v50, v52, v54), 3.38 and 40(v55, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66), 3.34, 3.36, 3.38 and 40(v67, v68, v69, v70), 41(v72, v75, v76, v77, v78, v80), 42(v82), 43(v83, v84, v85).
+Tested on Fedora, OpenSUSE, Manjaro, Ubuntu and FreeBSD, GNOME-shell [3.38](../../tree/3.38)(v3, v5, v9, v11, v14, v15, v17, v19, v21, v23, v25, v27, v29, v31, v35, v37, v39, v41, v43, v45, v47, v49, v51, v53(merged into main in later version)), 40.0(v4, v8, v10, v12, v13, v16, v18, v20, v22, v24, v26, v28, v30, v32, v36, v38, v40, v42, v44, v46, v48, v50, v52, v54), 3.38 and 40(v55, v56, v57, v58, v59, v60, v61, v62, v63, v64, v65, v66), 3.34, 3.36, 3.38 and 40(v67, v68, v69, v70), 41(v72, v75, v76, v77, v78, v80), 42(v82), 43(v83, v84, v85), 44(v86).
 
 ## Acknowledgements
 

diff --git a/README_CN.md b/README_CN.md
@@ -6,9 +6,6 @@
 [![GPL Licence](https://img.shields.io/badge/license-GPL-blue)](https://opensource.org/licenses/GPL-3.0/)
 [![Repo-Size](https://img.shields.io/github/repo-size/openSUSE/Customize-IBus.svg)](https://github.com/openSUSE/Customize-IBus/archive/main.zip)
 
-[![Total alerts](https://img.shields.io/lgtm/alerts/g/openSUSE/Customize-IBus.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openSUSE/Customize-IBus/alerts/)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/openSUSE/Customize-IBus.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openSUSE/Customize-IBus/context:javascript)
-
 ### 欢迎在 Weblate 中贡献你的翻译！
 
 [![翻译状态](https://hosted.weblate.org/widgets/ibus-customize/-/287x66-grey.png)](https://hosted.weblate.org/engage/ibus-customize/)
@@ -42,7 +39,7 @@ cd Customize-IBus && make install
 yay -S gnome-shell-extension-customize-ibus
 ```
 
-[![AUR](https://aur.archlinux.org/css/archnavbar/aurlogo.png)](https://aur.archlinux.org/packages/gnome-shell-extension-customize-ibus/)
+[![AUR](https://aur.archlinux.org/static/css/archnavbar/aurlogo.png)](https://aur.archlinux.org/packages/gnome-shell-extension-customize-ibus/)
 
 [Fedora](../../tree/package-repo#fedora)也可使用 RPM Repository 安装为系统插件:
 
@@ -280,8 +277,9 @@ background-size: cover;
 - [x] V83: 支持 GNOME 43。
 - [x] V84: 修复锁屏界面主题受影响问题。
 - [x] V85: 修复屏幕解锁后主题加载问题。
+- [x] V86: 支持 GNOME 44。
 
-在 Fedora，OpenSUSE，Manjaro，Ubuntu 和 FreeBSD，GNOME-shell [3.38](../../tree/3.38)(v3，v5，v9，v11，v14，v15，v17，v19，v21，v23，v25，v27，v29，v31，v35，v37，v39，v41，v43，v45，v47，v49，v51，v53(之后的合并进了主版本))，40.0(v4，v8，v10，v12，v13，v16，v18，v20，v22，v24，v26，v28，v30，v32，v36，v38，v40，v42，v44，v46，v48，v50，v52，v54)，3.38 和 40(v55，v56，v57，v58，v59，v60，v61，v62，v63，v64，v65，v66)，3.34，3.36，3.38 和 40(v67，v68，v69，v70)，41(v72，v75，v76，v77，v78，v80)，42(v82)，43(v83，v84，v85)中通过了测试。
+在 Fedora，OpenSUSE，Manjaro，Ubuntu 和 FreeBSD，GNOME-shell [3.38](../../tree/3.38)(v3，v5，v9，v11，v14，v15，v17，v19，v21，v23，v25，v27，v29，v31，v35，v37，v39，v41，v43，v45，v47，v49，v51，v53(之后的合并进了主版本))，40.0(v4，v8，v10，v12，v13，v16，v18，v20，v22，v24，v26，v28，v30，v32，v36，v38，v40，v42，v44，v46，v48，v50，v52，v54)，3.38 和 40(v55，v56，v57，v58，v59，v60，v61，v62，v63，v64，v65，v66)，3.34，3.36，3.38 和 40(v67，v68，v69，v70)，41(v72，v75，v76，v77，v78，v80)，42(v82)，43(v83，v84，v85)，44(v86)中通过了测试。
 
 ## 致谢
 

diff --git a/bsd/Makefile b/bsd/Makefile
@@ -32,7 +32,7 @@ GH_PROJECT=	Customize-IBus
 
 PKGMESSAGE=	/usr/ports/deskutils/gnome-shell-extra-extensions/pkg-message.slaves
 
-_VER=			85
+_VER=			86
 _UUID=			[email protected]
 _SCHEMA=		org.gnome.shell.extensions.customize-ibus.gschema.xml
 

diff --git a/[email protected]/extension.js b/[email protected]/extension.js
@@ -1170,13 +1170,12 @@ const IBusTrayClickSwitch = GObject.registerClass(
 
     set traysswitchkey(traysswitchkey) {
       if (this._buttonPressID)
-        InputSourceIndicator.container.disconnect(this._buttonPressID),
+        InputSourceIndicator.disconnect(this._buttonPressID),
           (this._buttonPressID = 0);
       let keyNum = traysswitchkey == 0 ? "1" : "3";
       if (Meta.is_wayland_compositor())
         keyNum = traysswitchkey == 0 ? "1" : "2";
-      InputSourceIndicator.container.reactive = true;
-      this._buttonPressID = InputSourceIndicator.container.connect(
+      this._buttonPressID = InputSourceIndicator.connect(
         "button-press-event",
         function (actor, event) {
           if (
@@ -1185,16 +1184,18 @@ const IBusTrayClickSwitch = GObject.registerClass(
           ) {
             IBusManager.activateProperty(INPUTMODE, IBus.PropState.CHECKED);
             InputSourceIndicator.menu.close();
+            // A hack to make it work in GNOME 44
+            InputSourceIndicator.menu.open();
+            InputSourceIndicator.menu.close();
           }
         }
       );
     }
 
     destroy() {
       if (this._buttonPressID)
-        InputSourceIndicator.container.disconnect(this._buttonPressID),
+        InputSourceIndicator.disconnect(this._buttonPressID),
           (this._buttonPressID = 0);
-      InputSourceIndicator.container.reactive = false;
     }
   }
 );

diff --git a/[email protected]/locale/customize-ibus.pot b/[email protected]/locale/customize-ibus.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Customize Ibus 85\n"
+"Project-Id-Version: Customize Ibus 86\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-01 10:35+0200\n"
+"POT-Creation-Date: 2023-03-08 00:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,63 +17,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: extension.js:1503
+#: extension.js:1504
 msgid "IBus panel service connected!"
 msgstr ""
 
-#: extension.js:2105
+#: extension.js:2106
 msgid "loading light user theme for IBus:"
 msgstr ""
 
-#: extension.js:2115
+#: extension.js:2116
 msgid "loading dark user theme for IBus:"
 msgstr ""
 
-#: extension.js:2120
+#: extension.js:2121
 msgid "loading default theme for IBus"
 msgstr ""
 
-#: extension.js:2316
+#: extension.js:2317
 msgid "loading background for IBus:"
 msgstr ""
 
-#: extension.js:2326
+#: extension.js:2327
 msgid "remove custom background for IBus"
 msgstr ""
 
-#: extension.js:2912
+#: extension.js:2913
 msgid "Starting / Restarting IBus..."
 msgstr ""
 
-#: extension.js:2941
+#: extension.js:2942
 msgid "Copy Emoji"
 msgstr ""
 
-#: extension.js:2962 prefs.js:1688 prefs.js:2078
+#: extension.js:2963 prefs.js:1688 prefs.js:2078
 msgid "Customize IBus"
 msgstr ""
 
-#: extension.js:2986 prefs.js:298 prefs.js:554
+#: extension.js:2987 prefs.js:298 prefs.js:554
 msgid "IBus Preferences"
 msgstr ""
 
-#: extension.js:3007 extension.js:3020 prefs.js:558
+#: extension.js:3008 extension.js:3021 prefs.js:558
 msgid "IBus Version"
 msgstr ""
 
-#: extension.js:3046
+#: extension.js:3047
 msgid "Restart"
 msgstr ""
 
-#: extension.js:3075
+#: extension.js:3076
 msgid "Restarting IBus..."
 msgstr ""
 
-#: extension.js:3096
+#: extension.js:3097
 msgid "Quit"
 msgstr ""
 
-#: extension.js:3110
+#: extension.js:3111
 msgid "Exiting IBus..."
 msgstr ""
 

diff --git a/[email protected]/locale/eo/LC_MESSAGES/customize-ibus.po b/[email protected]/locale/eo/LC_MESSAGES/customize-ibus.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Customize Ibus 85\n"
+"Project-Id-Version: Customize Ibus 86\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-01 10:35+0200\n"
+"POT-Creation-Date: 2023-03-08 00:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,63 +16,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: extension.js:1503
+#: extension.js:1504
 msgid "IBus panel service connected!"
 msgstr ""
 
-#: extension.js:2105
+#: extension.js:2106
 msgid "loading light user theme for IBus:"
 msgstr ""
 
-#: extension.js:2115
+#: extension.js:2116
 msgid "loading dark user theme for IBus:"
 msgstr ""
 
-#: extension.js:2120
+#: extension.js:2121
 msgid "loading default theme for IBus"
 msgstr ""
 
-#: extension.js:2316
+#: extension.js:2317
 msgid "loading background for IBus:"
 msgstr ""
 
-#: extension.js:2326
+#: extension.js:2327
 msgid "remove custom background for IBus"
 msgstr ""
 
-#: extension.js:2912
+#: extension.js:2913
 msgid "Starting / Restarting IBus..."
 msgstr ""
 
-#: extension.js:2941
+#: extension.js:2942
 msgid "Copy Emoji"
 msgstr ""
 
-#: extension.js:2962 prefs.js:1688 prefs.js:2078
+#: extension.js:2963 prefs.js:1688 prefs.js:2078
 msgid "Customize IBus"
 msgstr ""
 
-#: extension.js:2986 prefs.js:298 prefs.js:554
+#: extension.js:2987 prefs.js:298 prefs.js:554
 msgid "IBus Preferences"
 msgstr "Agordoj pri IBus"
 
-#: extension.js:3007 extension.js:3020 prefs.js:558
+#: extension.js:3008 extension.js:3021 prefs.js:558
 msgid "IBus Version"
 msgstr "Versio de IBus"
 
-#: extension.js:3046
+#: extension.js:3047
 msgid "Restart"
 msgstr "Relanĉi"
 
-#: extension.js:3075
+#: extension.js:3076
 msgid "Restarting IBus..."
 msgstr "Relanĉante IBus…"
 
-#: extension.js:3096
+#: extension.js:3097
 msgid "Quit"
 msgstr "Forlasi"
 
-#: extension.js:3110
+#: extension.js:3111
 msgid "Exiting IBus..."
 msgstr ""
 

diff --git a/[email protected]/locale/fr/LC_MESSAGES/customize-ibus.po b/[email protected]/locale/fr/LC_MESSAGES/customize-ibus.po
@@ -4,9 +4,9 @@
 # J. Lavoie <[email protected]>, 2021.
 msgid ""
 msgstr ""
-"Project-Id-Version: Customize Ibus 85\n"
+"Project-Id-Version: Customize Ibus 86\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-01 10:35+0200\n"
+"POT-Creation-Date: 2023-03-08 00:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -15,63 +15,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: extension.js:1503
+#: extension.js:1504
 msgid "IBus panel service connected!"
 msgstr ""
 
-#: extension.js:2105
+#: extension.js:2106
 msgid "loading light user theme for IBus:"
 msgstr ""
 
-#: extension.js:2115
+#: extension.js:2116
 msgid "loading dark user theme for IBus:"
 msgstr ""
 
-#: extension.js:2120
+#: extension.js:2121
 msgid "loading default theme for IBus"
 msgstr ""
 
-#: extension.js:2316
+#: extension.js:2317
 msgid "loading background for IBus:"
 msgstr ""
 
-#: extension.js:2326
+#: extension.js:2327
 msgid "remove custom background for IBus"
 msgstr ""
 
-#: extension.js:2912
+#: extension.js:2913
 msgid "Starting / Restarting IBus..."
 msgstr ""
 
-#: extension.js:2941
+#: extension.js:2942
 msgid "Copy Emoji"
 msgstr ""
 
-#: extension.js:2962 prefs.js:1688 prefs.js:2078
+#: extension.js:2963 prefs.js:1688 prefs.js:2078
 msgid "Customize IBus"
 msgstr ""
 
-#: extension.js:2986 prefs.js:298 prefs.js:554
+#: extension.js:2987 prefs.js:298 prefs.js:554
 msgid "IBus Preferences"
 msgstr ""
 
-#: extension.js:3007 extension.js:3020 prefs.js:558
+#: extension.js:3008 extension.js:3021 prefs.js:558
 msgid "IBus Version"
 msgstr ""
 
-#: extension.js:3046
+#: extension.js:3047
 msgid "Restart"
 msgstr ""
 
-#: extension.js:3075
+#: extension.js:3076
 msgid "Restarting IBus..."
 msgstr ""
 
-#: extension.js:3096
+#: extension.js:3097
 msgid "Quit"
 msgstr ""
 
-#: extension.js:3110
+#: extension.js:3111
 msgid "Exiting IBus..."
 msgstr ""