Skip to content

Commit bb20b00

Browse files
HollowMan6HollowMan6
committed
v89: Add support for GNOME 46
Signed-off-by: Hollow Man <hollowman@opensuse.org>
1 parent 68abab1 commit bb20b00

13 files changed

Lines changed: 440 additions & 790 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,9 @@ When only the light background or dark background is turned on, the extension wi
279279
- [x] V85: Fix loading theme after unlocking the screen.
280280
- [x] V86: Add support for GNOME 44.
281281
- [x] V88: Have support for GNOME 45 (No support for any previous GNOME version now).
282+
- [x] V89: Have support for GNOME 46 (No support for GNOME version 45 now).
282283

283-
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).
284+
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).
284285

285286
## Acknowledgements
286287

‎README_CN.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,9 @@ background-size: cover;
279279
- [x] V85: 修复屏幕解锁后主题加载问题。
280280
- [x] V86: 支持 GNOME 44。
281281
- [x] V88: 支持 GNOME 45 (现无任何之前GNOME版本支持)。
282+
- [x] V89: 支持 GNOME 46 (无GNOME 45版本支持)。
282283

283-
在 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)中通过了测试。
284+
在 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)中通过了测试。
284285

285286
## 致谢
286287

‎customize-ibus@hollowman.ml/extension.js‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,8 +1328,8 @@ const IBusInputSourceIndicator = GObject.registerClass(
13281328
this._justSwitchedWindow = false;
13291329
this.style_class = "candidate-popup-boxpointer";
13301330
this._dummyCursor = new St.Widget({ opacity: 0 });
1331-
Main.layoutManager.uiGroup.add_actor(this._dummyCursor);
1332-
Main.layoutManager.addChrome(this);
1331+
Main.layoutManager.uiGroup.add_child(this._dummyCursor);
1332+
Main.layoutManager.addTopChrome(this);
13331333
let box = new St.BoxLayout({
13341334
style_class: "candidate-popup-content",
13351335
vertical: true,
@@ -1339,7 +1339,7 @@ const IBusInputSourceIndicator = GObject.registerClass(
13391339
style_class: "candidate-popup-text",
13401340
visible: true,
13411341
});
1342-
box.add(this._inputIndicatorLabel);
1342+
box.add_child(this._inputIndicatorLabel);
13431343

13441344
this._child_opacity = [];
13451345
let candidate_child = this.bin.get_children();
@@ -2880,14 +2880,17 @@ const Extensions = GObject.registerClass(
28802880
});
28812881
});
28822882
let title = _("Starting / Restarting IBus...");
2883-
let source = new MessageTray.Source(title, "dialog-information");
2883+
let source = new MessageTray.Source({
2884+
title,
2885+
iconName: "dialog-information",
2886+
});
28842887
Main.messageTray.add(source);
2885-
let notification = new MessageTray.Notification(
2888+
let notification = new MessageTray.Notification({
28862889
source,
28872890
title,
2888-
new Date(parseInt(ibusresttime)).toString(),
2889-
);
2890-
source.showNotification(notification);
2891+
datetime: GLib.DateTime.new_from_unix_local(parseInt(ibusresttime)),
2892+
});
2893+
source.addNotification(notification);
28912894
}
28922895
this._not_extension_first_start = true;
28932896
}
@@ -2980,19 +2983,24 @@ const Extensions = GObject.registerClass(
29802983
_MenuIBusVer() {
29812984
Main.overview.hide();
29822985
let title = _("IBus Version");
2983-
let source = new MessageTray.Source(title, "dialog-information");
2986+
let source = new MessageTray.Source({
2987+
title,
2988+
iconName: "dialog-information",
2989+
});
29842990
Main.messageTray.add(source);
2985-
let notification = new MessageTray.Notification(
2991+
let notification = new MessageTray.Notification({
29862992
source,
29872993
title,
2988-
"v" +
2994+
body:
2995+
"v" +
29892996
IBus.MAJOR_VERSION +
29902997
"." +
29912998
IBus.MINOR_VERSION +
29922999
"." +
29933000
IBus.MICRO_VERSION,
2994-
);
2995-
source.showNotification(notification);
3001+
datetime: GLib.DateTime.new_now_local(),
3002+
});
3003+
source.addNotification(notification);
29963004
}
29973005

29983006
// Restarting IBus
@@ -3030,14 +3038,17 @@ const Extensions = GObject.registerClass(
30303038
});
30313039
});
30323040
let title = _("Restarting IBus...");
3033-
let source = new MessageTray.Source(title, "dialog-information");
3041+
let source = new MessageTray.Source({
3042+
title,
3043+
iconName: "dialog-information",
3044+
});
30343045
Main.messageTray.add(source);
3035-
let notification = new MessageTray.Notification(
3046+
let notification = new MessageTray.Notification({
30363047
source,
30373048
title,
3038-
new Date().toString(),
3039-
);
3040-
source.showNotification(notification);
3049+
datetime: GLib.DateTime.new_now_local(),
3050+
});
3051+
source.addNotification(notification);
30413052
}
30423053

30433054
// Exiting IBus
@@ -3060,14 +3071,17 @@ const Extensions = GObject.registerClass(
30603071
Main.overview.hide();
30613072
Util.spawn(["ibus", "exit"]);
30623073
let title = _("Exiting IBus...");
3063-
let source = new MessageTray.Source(title, "dialog-information");
3074+
let source = new MessageTray.Source({
3075+
title,
3076+
iconName: "dialog-information",
3077+
});
30643078
Main.messageTray.add(source);
3065-
let notification = new MessageTray.Notification(
3079+
let notification = new MessageTray.Notification({
30663080
source,
30673081
title,
3068-
new Date().toString(),
3069-
);
3070-
source.showNotification(notification);
3082+
datetime: GLib.DateTime.new_now_local(),
3083+
});
3084+
source.addNotification(notification);
30713085
}
30723086

30733087
destroy() {

‎customize-ibus@hollowman.ml/locale/customize-ibus.pot‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Customize Ibus 87\n"
9+
"Project-Id-Version: Customize Ibus 89\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2023-09-11 20:45+0200\n"
11+
"POT-Creation-Date: 2024-04-06 18:06+0300\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,35 +45,35 @@ msgstr ""
4545
msgid "Starting / Restarting IBus..."
4646
msgstr ""
4747

48-
#: extension.js:2906
48+
#: extension.js:2909
4949
msgid "Copy Emoji"
5050
msgstr ""
5151

52-
#: extension.js:2927 prefs.js:1569 prefs.js:2012
52+
#: extension.js:2930 prefs.js:1569 prefs.js:2012
5353
msgid "Customize IBus"
5454
msgstr ""
5555

56-
#: extension.js:2948 prefs.js:295 prefs.js:527
56+
#: extension.js:2951 prefs.js:295 prefs.js:527
5757
msgid "IBus Preferences"
5858
msgstr ""
5959

60-
#: extension.js:2969 extension.js:2982 prefs.js:531
60+
#: extension.js:2972 extension.js:2985 prefs.js:531
6161
msgid "IBus Version"
6262
msgstr ""
6363

64-
#: extension.js:3003
64+
#: extension.js:3011
6565
msgid "Restart"
6666
msgstr ""
6767

68-
#: extension.js:3032
68+
#: extension.js:3040
6969
msgid "Restarting IBus..."
7070
msgstr ""
7171

72-
#: extension.js:3048
72+
#: extension.js:3059
7373
msgid "Quit"
7474
msgstr ""
7575

76-
#: extension.js:3062
76+
#: extension.js:3073
7777
msgid "Exiting IBus..."
7878
msgstr ""
7979

‎customize-ibus@hollowman.ml/locale/eo/LC_MESSAGES/customize-ibus.po‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#
66
msgid ""
77
msgstr ""
8-
"Project-Id-Version: Customize Ibus 86\n"
8+
"Project-Id-Version: Customize Ibus 89\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2023-09-11 20:45+0200\n"
10+
"POT-Creation-Date: 2024-04-06 18:06+0300\n"
1111
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -44,35 +44,35 @@ msgstr ""
4444
msgid "Starting / Restarting IBus..."
4545
msgstr ""
4646

47-
#: extension.js:2906
47+
#: extension.js:2909
4848
msgid "Copy Emoji"
4949
msgstr ""
5050

51-
#: extension.js:2927 prefs.js:1569 prefs.js:2012
51+
#: extension.js:2930 prefs.js:1569 prefs.js:2012
5252
msgid "Customize IBus"
5353
msgstr ""
5454

55-
#: extension.js:2948 prefs.js:295 prefs.js:527
55+
#: extension.js:2951 prefs.js:295 prefs.js:527
5656
msgid "IBus Preferences"
5757
msgstr "Agordoj pri IBus"
5858

59-
#: extension.js:2969 extension.js:2982 prefs.js:531
59+
#: extension.js:2972 extension.js:2985 prefs.js:531
6060
msgid "IBus Version"
6161
msgstr "Versio de IBus"
6262

63-
#: extension.js:3003
63+
#: extension.js:3011
6464
msgid "Restart"
6565
msgstr "Relanĉi"
6666

67-
#: extension.js:3032
67+
#: extension.js:3040
6868
msgid "Restarting IBus..."
6969
msgstr "Relanĉante IBus…"
7070

71-
#: extension.js:3048
71+
#: extension.js:3059
7272
msgid "Quit"
7373
msgstr "Forlasi"
7474

75-
#: extension.js:3062
75+
#: extension.js:3073
7676
msgid "Exiting IBus..."
7777
msgstr ""
7878

@@ -450,12 +450,12 @@ msgstr ""
450450
#: prefs.js:1610
451451
msgid ""
452452
"<span size=\"small\">Copyright © 2021-2023 <a href=\"https://github.com/"
453-
"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse.org"
454-
"\">hollowman@opensuse.org</a>&gt;</span>"
453+
"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse."
454+
"org\">hollowman@opensuse.org</a>&gt;</span>"
455455
msgstr ""
456456
"<span size=\"small\">Kopirajtoj © 2021-2023 <a href=\"https://github.com/"
457-
"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse.org"
458-
"\">hollowman@opensuse.org</a>&gt;</span>"
457+
"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse."
458+
"org\">hollowman@opensuse.org</a>&gt;</span>"
459459

460460
#: prefs.js:1622
461461
msgid ""
@@ -483,8 +483,8 @@ msgstr ""
483483

484484
#: prefs.js:1687
485485
msgid ""
486-
"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/gpl"
487-
"\">GNU General Public License, version 3 or later</a> for details.</span>"
486+
"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/"
487+
"gpl\">GNU General Public License, version 3 or later</a> for details.</span>"
488488
msgstr ""
489489

490490
#: prefs.js:1705
@@ -561,8 +561,8 @@ msgstr ""
561561
#: prefs.js:1793
562562
msgid ""
563563
"Support importing stylesheet generated by <a href=\"https://github.com/"
564-
"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a href="
565-
"\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
564+
"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a "
565+
"href=\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
566566
msgstr ""
567567

568568
#: prefs.js:1802

‎customize-ibus@hollowman.ml/locale/fr/LC_MESSAGES/customize-ibus.po‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# J. Lavoie <j.lavoie@net-c.ca>, 2021.
55
msgid ""
66
msgstr ""
7-
"Project-Id-Version: Customize Ibus 86\n"
7+
"Project-Id-Version: Customize Ibus 89\n"
88
"Report-Msgid-Bugs-To: \n"
9-
"POT-Creation-Date: 2023-09-11 20:45+0200\n"
9+
"POT-Creation-Date: 2024-04-06 18:06+0300\n"
1010
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1111
"Last-Translator: Automatically generated\n"
1212
"Language-Team: none\n"
@@ -43,35 +43,35 @@ msgstr ""
4343
msgid "Starting / Restarting IBus..."
4444
msgstr ""
4545

46-
#: extension.js:2906
46+
#: extension.js:2909
4747
msgid "Copy Emoji"
4848
msgstr ""
4949

50-
#: extension.js:2927 prefs.js:1569 prefs.js:2012
50+
#: extension.js:2930 prefs.js:1569 prefs.js:2012
5151
msgid "Customize IBus"
5252
msgstr ""
5353

54-
#: extension.js:2948 prefs.js:295 prefs.js:527
54+
#: extension.js:2951 prefs.js:295 prefs.js:527
5555
msgid "IBus Preferences"
5656
msgstr ""
5757

58-
#: extension.js:2969 extension.js:2982 prefs.js:531
58+
#: extension.js:2972 extension.js:2985 prefs.js:531
5959
msgid "IBus Version"
6060
msgstr ""
6161

62-
#: extension.js:3003
62+
#: extension.js:3011
6363
msgid "Restart"
6464
msgstr ""
6565

66-
#: extension.js:3032
66+
#: extension.js:3040
6767
msgid "Restarting IBus..."
6868
msgstr ""
6969

70-
#: extension.js:3048
70+
#: extension.js:3059
7171
msgid "Quit"
7272
msgstr ""
7373

74-
#: extension.js:3062
74+
#: extension.js:3073
7575
msgid "Exiting IBus..."
7676
msgstr ""
7777

@@ -449,8 +449,8 @@ msgstr ""
449449
#: prefs.js:1610
450450
msgid ""
451451
"<span size=\"small\">Copyright © 2021-2023 <a href=\"https://github.com/"
452-
"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse.org"
453-
"\">hollowman@opensuse.org</a>&gt;</span>"
452+
"HollowMan6\">Hollow Man</a> &lt;<a href=\"mailto:hollowman@opensuse."
453+
"org\">hollowman@opensuse.org</a>&gt;</span>"
454454
msgstr ""
455455

456456
#: prefs.js:1622
@@ -477,8 +477,8 @@ msgstr ""
477477

478478
#: prefs.js:1687
479479
msgid ""
480-
"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/gpl"
481-
"\">GNU General Public License, version 3 or later</a> for details.</span>"
480+
"<span size=\"small\">See the <a href=\"https://www.gnu.org/licenses/"
481+
"gpl\">GNU General Public License, version 3 or later</a> for details.</span>"
482482
msgstr ""
483483

484484
#: prefs.js:1705
@@ -555,8 +555,8 @@ msgstr ""
555555
#: prefs.js:1793
556556
msgid ""
557557
"Support importing stylesheet generated by <a href=\"https://github.com/"
558-
"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a href="
559-
"\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
558+
"openSUSE/IBus-Theme-Tools\">IBus Theme Tools</a> or provided by <a "
559+
"href=\"https://github.com/openSUSE/IBus-Theme-Hub\">IBus Theme Hub</a>."
560560
msgstr ""
561561

562562
#: prefs.js:1802

0 commit comments

Comments
 (0)