v89: Add support for GNOME 46

Signed-off-by: Hollow Man <[email protected]>
openSUSE · Apr 6, 2024 · bb20b00 · bb20b00
1 parent 68abab1
commit bb20b00
Show file tree

Hide file tree

Showing 13 changed files with 440 additions and 790 deletions.
diff --git a/README.md b/README.md
@@ -279,8 +279,9 @@ When only the light background or dark background is turned on, the extension wi
 - [x] V85: Fix loading theme after unlocking the screen.
 - [x] V86: Add support for GNOME 44.
 - [x] V88: Have support for GNOME 45 (No support for any previous GNOME version now).
+- [x] V89: Have support for GNOME 46 (No support for GNOME version 45 now).
 
-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), 45(v88).
+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), 45(v88), 46(v89).
 
 ## Acknowledgements
 

diff --git a/README_CN.md b/README_CN.md
@@ -279,8 +279,9 @@ background-size: cover;
 - [x] V85: 修复屏幕解锁后主题加载问题。
 - [x] V86: 支持 GNOME 44。
 - [x] V88: 支持 GNOME 45 (现无任何之前GNOME版本支持)。
+- [x] V89: 支持 GNOME 46 (无GNOME 45版本支持)。
 
-在 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)，45(v88)中通过了测试。
+在 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)，45(v88)，46(v89)中通过了测试。
 
 ## 致谢
 

diff --git a/[email protected]/extension.js b/[email protected]/extension.js
@@ -1328,8 +1328,8 @@ const IBusInputSourceIndicator = GObject.registerClass(
       this._justSwitchedWindow = false;
       this.style_class = "candidate-popup-boxpointer";
       this._dummyCursor = new St.Widget({ opacity: 0 });
-      Main.layoutManager.uiGroup.add_actor(this._dummyCursor);
-      Main.layoutManager.addChrome(this);
+      Main.layoutManager.uiGroup.add_child(this._dummyCursor);
+      Main.layoutManager.addTopChrome(this);
       let box = new St.BoxLayout({
         style_class: "candidate-popup-content",
         vertical: true,
@@ -1339,7 +1339,7 @@ const IBusInputSourceIndicator = GObject.registerClass(
         style_class: "candidate-popup-text",
         visible: true,
       });
-      box.add(this._inputIndicatorLabel);
+      box.add_child(this._inputIndicatorLabel);
 
       this._child_opacity = [];
       let candidate_child = this.bin.get_children();
@@ -2880,14 +2880,17 @@ const Extensions = GObject.registerClass(
               });
           });
         let title = _("Starting / Restarting IBus...");
-        let source = new MessageTray.Source(title, "dialog-information");
+        let source = new MessageTray.Source({
+          title,
+          iconName: "dialog-information",
+        });
         Main.messageTray.add(source);
-        let notification = new MessageTray.Notification(
+        let notification = new MessageTray.Notification({
           source,
           title,
-          new Date(parseInt(ibusresttime)).toString(),
-        );
-        source.showNotification(notification);
+          datetime: GLib.DateTime.new_from_unix_local(parseInt(ibusresttime)),
+        });
+        source.addNotification(notification);
       }
       this._not_extension_first_start = true;
     }
@@ -2980,19 +2983,24 @@ const Extensions = GObject.registerClass(
     _MenuIBusVer() {
       Main.overview.hide();
       let title = _("IBus Version");
-      let source = new MessageTray.Source(title, "dialog-information");
+      let source = new MessageTray.Source({
+        title,
+        iconName: "dialog-information",
+      });
       Main.messageTray.add(source);
-      let notification = new MessageTray.Notification(
+      let notification = new MessageTray.Notification({
         source,
         title,
-        "v" +
+        body:
+          "v" +
           IBus.MAJOR_VERSION +
           "." +
           IBus.MINOR_VERSION +
           "." +
           IBus.MICRO_VERSION,
-      );
-      source.showNotification(notification);
+        datetime: GLib.DateTime.new_now_local(),
+      });
+      source.addNotification(notification);
     }
 
     // Restarting IBus
@@ -3030,14 +3038,17 @@ const Extensions = GObject.registerClass(
             });
         });
       let title = _("Restarting IBus...");
-      let source = new MessageTray.Source(title, "dialog-information");
+      let source = new MessageTray.Source({
+        title,
+        iconName: "dialog-information",
+      });
       Main.messageTray.add(source);
-      let notification = new MessageTray.Notification(
+      let notification = new MessageTray.Notification({
         source,
         title,
-        new Date().toString(),
-      );
-      source.showNotification(notification);
+        datetime: GLib.DateTime.new_now_local(),
+      });
+      source.addNotification(notification);
     }
 
     // Exiting IBus
@@ -3060,14 +3071,17 @@ const Extensions = GObject.registerClass(
       Main.overview.hide();
       Util.spawn(["ibus", "exit"]);
       let title = _("Exiting IBus...");
-      let source = new MessageTray.Source(title, "dialog-information");
+      let source = new MessageTray.Source({
+        title,
+        iconName: "dialog-information",
+      });
       Main.messageTray.add(source);
-      let notification = new MessageTray.Notification(
+      let notification = new MessageTray.Notification({
         source,
         title,
-        new Date().toString(),
-      );
-      source.showNotification(notification);
+        datetime: GLib.DateTime.new_now_local(),
+      });
+      source.addNotification(notification);
     }
 
     destroy() {

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 87\n"
+"Project-Id-Version: Customize Ibus 89\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-11 20:45+0200\n"
+"POT-Creation-Date: 2024-04-06 18:06+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -45,35 +45,35 @@ msgstr ""
 msgid "Starting / Restarting IBus..."
 msgstr ""
 
-#: extension.js:2906
+#: extension.js:2909
 msgid "Copy Emoji"
 msgstr ""
 
-#: extension.js:2927 prefs.js:1569 prefs.js:2012
+#: extension.js:2930 prefs.js:1569 prefs.js:2012
 msgid "Customize IBus"
 msgstr ""
 
-#: extension.js:2948 prefs.js:295 prefs.js:527
+#: extension.js:2951 prefs.js:295 prefs.js:527
 msgid "IBus Preferences"
 msgstr ""
 
-#: extension.js:2969 extension.js:2982 prefs.js:531
+#: extension.js:2972 extension.js:2985 prefs.js:531
 msgid "IBus Version"
 msgstr ""
 
-#: extension.js:3003
+#: extension.js:3011
 msgid "Restart"
 msgstr ""
 
-#: extension.js:3032
+#: extension.js:3040
 msgid "Restarting IBus..."
 msgstr ""
 
-#: extension.js:3048
+#: extension.js:3059
 msgid "Quit"
 msgstr ""
 
-#: extension.js:3062
+#: extension.js:3073
 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 86\n"
+"Project-Id-Version: Customize Ibus 89\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-11 20:45+0200\n"
+"POT-Creation-Date: 2024-04-06 18:06+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -44,35 +44,35 @@ msgstr ""
 msgid "Starting / Restarting IBus..."
 msgstr ""
 
-#: extension.js:2906
+#: extension.js:2909
 msgid "Copy Emoji"
 msgstr ""
 
-#: extension.js:2927 prefs.js:1569 prefs.js:2012
+#: extension.js:2930 prefs.js:1569 prefs.js:2012
 msgid "Customize IBus"
 msgstr ""
 
-#: extension.js:2948 prefs.js:295 prefs.js:527
+#: extension.js:2951 prefs.js:295 prefs.js:527
 msgid "IBus Preferences"
 msgstr "Agordoj pri IBus"
 
-#: extension.js:2969 extension.js:2982 prefs.js:531
+#: extension.js:2972 extension.js:2985 prefs.js:531
 msgid "IBus Version"
 msgstr "Versio de IBus"
 
-#: extension.js:3003
+#: extension.js:3011
 msgid "Restart"
 msgstr "Relanĉi"
 
-#: extension.js:3032
+#: extension.js:3040
 msgid "Restarting IBus..."
 msgstr "Relanĉante IBus…"
 
-#: extension.js:3048
+#: extension.js:3059
 msgid "Quit"
 msgstr "Forlasi"
 
-#: extension.js:3062
+#: extension.js:3073
 msgid "Exiting IBus..."
 msgstr ""
 
@@ -450,12 +450,12 @@ msgstr ""
 #: prefs.js:1610
 msgid ""
 "<span size=\"small\">Copyright © 2021-2023 <a href=\"https://github.com/"
-"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse.org"
-"\">[email protected]</a>&gt;</span>"
+"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse."
+"org\">[email protected]</a>&gt;</span>"
 msgstr ""
 "<span size=\"small\">Kopirajtoj © 2021-2023 <a href=\"https://github.com/"
-"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse.org"
-"\">[email protected]</a>&gt;</span>"
+"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse."
+"org\">[email protected]</a>&gt;</span>"
 
 #: prefs.js:1622
 msgid ""
@@ -483,8 +483,8 @@ msgstr ""
 
 #: prefs.js:1687
 msgid ""
-"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/gpl"
-"\">GNU General Public License, version 3 or later</a> for details.</span>"
+"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/"
+"gpl\">GNU General Public License, version 3 or later</a> for details.</span>"
 msgstr ""
 
 #: prefs.js:1705
@@ -561,8 +561,8 @@ msgstr ""
 #: prefs.js:1793
 msgid ""
 "Support importing stylesheet generated by <a href=\"https://github.com/"
-"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a href="
-"\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
+"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a "
+"href=\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
 msgstr ""
 
 #: prefs.js:1802

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 86\n"
+"Project-Id-Version: Customize Ibus 89\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-11 20:45+0200\n"
+"POT-Creation-Date: 2024-04-06 18:06+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -43,35 +43,35 @@ msgstr ""
 msgid "Starting / Restarting IBus..."
 msgstr ""
 
-#: extension.js:2906
+#: extension.js:2909
 msgid "Copy Emoji"
 msgstr ""
 
-#: extension.js:2927 prefs.js:1569 prefs.js:2012
+#: extension.js:2930 prefs.js:1569 prefs.js:2012
 msgid "Customize IBus"
 msgstr ""
 
-#: extension.js:2948 prefs.js:295 prefs.js:527
+#: extension.js:2951 prefs.js:295 prefs.js:527
 msgid "IBus Preferences"
 msgstr ""
 
-#: extension.js:2969 extension.js:2982 prefs.js:531
+#: extension.js:2972 extension.js:2985 prefs.js:531
 msgid "IBus Version"
 msgstr ""
 
-#: extension.js:3003
+#: extension.js:3011
 msgid "Restart"
 msgstr ""
 
-#: extension.js:3032
+#: extension.js:3040
 msgid "Restarting IBus..."
 msgstr ""
 
-#: extension.js:3048
+#: extension.js:3059
 msgid "Quit"
 msgstr ""
 
-#: extension.js:3062
+#: extension.js:3073
 msgid "Exiting IBus..."
 msgstr ""
 
@@ -449,8 +449,8 @@ msgstr ""
 #: prefs.js:1610
 msgid ""
 "<span size=\"small\">Copyright © 2021-2023 <a href=\"https://github.com/"
-"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse.org"
-"\">[email protected]</a>&gt;</span>"
+"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse."
+"org\">[email protected]</a>&gt;</span>"
 msgstr ""
 
 #: prefs.js:1622
@@ -477,8 +477,8 @@ msgstr ""
 
 #: prefs.js:1687
 msgid ""
-"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/gpl"
-"\">GNU General Public License, version 3 or later</a> for details.</span>"
+"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/"
+"gpl\">GNU General Public License, version 3 or later</a> for details.</span>"
 msgstr ""
 
 #: prefs.js:1705
@@ -555,8 +555,8 @@ msgstr ""
 #: prefs.js:1793
 msgid ""
 "Support importing stylesheet generated by <a href=\"https://github.com/"
-"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a href="
-"\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
+"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a "
+"href=\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
 msgstr ""
 
 #: prefs.js:1802