applets: Use new keybinding api for xlets.

mtwebster · mtwebster · commit 7be781ae54cc · 2025-11-20T22:55:57.000-05:00
diff --git a/docs/applets-examples/finder@cinnamon.org/applet.js b/docs/applets-examples/finder@cinnamon.org/applet.js
@@ -289,7 +289,11 @@ MyApplet.prototype =
 
     on_launch_shortcut_changed: function()
     {
-        Main.keybindingManager.addHotKey("finder_launch", this.launch_shortcut, Lang.bind(this, this.launch));
+        Main.keybindingManager.addXletHotKey(this, "finder_launch", this.launch_shortcut, Lang.bind(this, this.launch));
+    },
+
+    on_applet_removed_from_panel () {
+        Main.keybindingManager.removeXletHotKey(this, "finder_launch");
     },
 
     _onSearchTextChanged: function(se, prop)
diff --git a/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
@@ -174,7 +174,7 @@ class CinnamonCalendarApplet extends Applet.TextApplet {
     }
 
     _setKeybinding() {
-        Main.keybindingManager.addHotKey("calendar-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));
+        Main.keybindingManager.addXletHotKey(this, "calendar-open", this.keyOpen, Lang.bind(this, this._openMenu));
     }
 
     _clockNotify(obj, pspec, data) {
@@ -307,7 +307,7 @@ class CinnamonCalendarApplet extends Applet.TextApplet {
     }
 
     on_applet_removed_from_panel() {
-        Main.keybindingManager.removeHotKey("calendar-open-" + this.instance_id);
+        Main.keybindingManager.removeXletHotKey(this, "calendar-open");
         if (this.clock_notify_id > 0) {
             this.clock.disconnect(this.clock_notify_id);
             this.clock_notify_id = 0;
diff --git a/files/usr/share/cinnamon/applets/inhibit@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/inhibit@cinnamon.org/applet.js
@@ -434,10 +434,10 @@ class CinnamonInhibitApplet extends Applet.IconApplet {
     }
 
     _setKeybinding() {
-        Main.keybindingManager.addHotKey("inhibit-power-" + this.instance_id,
+        Main.keybindingManager.addXletHotKey(this, "inhibit-power",
             this.keyPower,
             Lang.bind(this, this.toggle_inhibit_power));
-        Main.keybindingManager.addHotKey("inhibit-notifications-" + this.instance_id,
+        Main.keybindingManager.addXletHotKey(this, "inhibit-notifications",
             this.keyNotifications,
             Lang.bind(this, this.toggle_inhibit_notifications));
     }
@@ -455,8 +455,8 @@ class CinnamonInhibitApplet extends Applet.IconApplet {
     }
 
     on_applet_removed_from_panel() {
-        Main.keybindingManager.removeHotKey("inhibit-power-" + this.instance_id);
-        Main.keybindingManager.removeHotKey("inhibit-notifications-" + this.instance_id);
+        Main.keybindingManager.removeXletHotKey(this, "inhibit-power");
+        Main.keybindingManager.removeXletHotKey(this, "inhibit-notifications");
         this.inhibitSwitch.kill();
     }
 
diff --git a/files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
@@ -1236,7 +1236,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
     }
 
     _updateKeybinding() {
-        Main.keybindingManager.addHotKey("overlay-key-" + this.instance_id, this.overlayKey, () => {
+        Main.keybindingManager.addXletHotKey(this, "overlay-key", this.overlayKey, () => {
             if (!Main.overview.visible && !Main.expo.visible) {
                 if (this.forceShowPanel && !this.isOpen) {
                     this.panel.peekPanel();
@@ -1359,7 +1359,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
     }
 
     on_applet_removed_from_panel () {
-        Main.keybindingManager.removeHotKey("overlay-key-" + this.instance_id);
+        Main.keybindingManager.removeXletHotKey(this, "overlay-key");
     }
 
     // settings button callbacks
diff --git a/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/network@cinnamon.org/applet.js
@@ -1825,7 +1825,7 @@ CinnamonNetworkApplet.prototype = {
     },
 
     _setKeybinding() {
-        Main.keybindingManager.addHotKey("network-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));
+        Main.keybindingManager.addXletHotKey(this, "network-open", this.keyOpen, Lang.bind(this, this._openMenu));
     },
 
     _clientGot: function(obj, result) {
@@ -2670,7 +2670,7 @@ CinnamonNetworkApplet.prototype = {
 
     on_applet_removed_from_panel: function() {
         Main.systrayManager.unregisterTrayIconReplacement(this.metadata.uuid);
-        Main.keybindingManager.removeHotKey("network-open-" + this.instance_id);
+        Main.keybindingManager.removeXletHotKey(this, "network-open");
         if (this._periodicTimeoutId){
             Mainloop.source_remove(this._periodicTimeoutId);
         }
diff --git a/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
@@ -47,13 +47,13 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {
     }
 
     _setKeybinding() {
-        Main.keybindingManager.addHotKey("notification-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));
-        Main.keybindingManager.addHotKey("notification-clear-" + this.instance_id, this.keyClear, Lang.bind(this, this._clear_all));
+        Main.keybindingManager.addXletHotKey(this, "notification-open", this.keyOpen, Lang.bind(this, this._openMenu));
+        Main.keybindingManager.addXletHotKey(this, "notification-clear", this.keyClear, Lang.bind(this, this._clear_all));
     }
 
     on_applet_removed_from_panel () {
-        Main.keybindingManager.removeHotKey("notification-open-" + this.instance_id);
-        Main.keybindingManager.removeHotKey("notification-clear-" + this.instance_id);
+        Main.keybindingManager.removeXletHotKey(this, "notification-open");
+        Main.keybindingManager.removeXletHotKey(this, "notification-clear");
         global.settings.disconnect(this.panelEditModeHandler);
     }
 
diff --git a/files/usr/share/cinnamon/applets/settings-example@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/settings-example@cinnamon.org/applet.js
@@ -53,7 +53,7 @@ class CinnamonSettingsExampleApplet extends Applet.TextIconApplet {
     }
 
     on_keybinding_changed() {
-        Main.keybindingManager.addHotKey("must-be-unique-id", this.keybinding, Lang.bind(this, this.on_hotkey_triggered));
+        Main.keybindingManager.addXletHotKey(this, "must-be-unique-id", this.keybinding, Lang.bind(this, this.on_hotkey_triggered));
     }
 
     on_settings_changed() {
@@ -129,6 +129,7 @@ class CinnamonSettingsExampleApplet extends Applet.TextIconApplet {
         this.settings.finalize();    // This is called when a user removes the applet from the panel.. we want to
                                      // Remove any connections and file listeners here, which our settings object
                                      // has a few of
+        Main.keybindingManager.removeXletHotKey(this, "must-be-unique-id");
     }
 }
 
diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
@@ -1111,7 +1111,7 @@ class CinnamonSoundApplet extends Applet.TextIconApplet {
     }
 
     _setKeybinding() {
-        Main.keybindingManager.addHotKey("sound-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));
+        Main.keybindingManager.addXletHotKey(this, "sound-open", this.keyOpen, Lang.bind(this, this._openMenu));
     }
 
     _on_overamplification_change () {
@@ -1141,7 +1141,7 @@ class CinnamonSoundApplet extends Applet.TextIconApplet {
     }
 
     on_applet_removed_from_panel () {
-        Main.keybindingManager.removeHotKey("sound-open-" + this.instance_id);
+        Main.keybindingManager.removeXletHotKey(this, "sound-open");
         if (this.hideSystray)
             this.unregisterSystrayIcons();
         if (this._iconTimeoutId) {

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ class CinnamonCalendarApplet extends Applet.TextApplet {`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`_setKeybinding() {`
`177`		`- Main.keybindingManager.addHotKey("calendar-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));`
	`177`	`+ Main.keybindingManager.addXletHotKey(this, "calendar-open", this.keyOpen, Lang.bind(this, this._openMenu));`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`_clockNotify(obj, pspec, data) {`
`@@ -307,7 +307,7 @@ class CinnamonCalendarApplet extends Applet.TextApplet {`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`on_applet_removed_from_panel() {`
`310`		`- Main.keybindingManager.removeHotKey("calendar-open-" + this.instance_id);`
	`310`	`+ Main.keybindingManager.removeXletHotKey(this, "calendar-open");`
`311`	`311`	`if (this.clock_notify_id > 0) {`
`312`	`312`	`this.clock.disconnect(this.clock_notify_id);`
`313`	`313`	`this.clock_notify_id = 0;`
Original file line number	Diff line number	Diff line change
`@@ -434,10 +434,10 @@ class CinnamonInhibitApplet extends Applet.IconApplet {`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`_setKeybinding() {`
`437`		`- Main.keybindingManager.addHotKey("inhibit-power-" + this.instance_id,`
	`437`	`+ Main.keybindingManager.addXletHotKey(this, "inhibit-power",`
`438`	`438`	`this.keyPower,`
`439`	`439`	`Lang.bind(this, this.toggle_inhibit_power));`
`440`		`- Main.keybindingManager.addHotKey("inhibit-notifications-" + this.instance_id,`
	`440`	`+ Main.keybindingManager.addXletHotKey(this, "inhibit-notifications",`
`441`	`441`	`this.keyNotifications,`
`442`	`442`	`Lang.bind(this, this.toggle_inhibit_notifications));`
`443`	`443`	`}`
`@@ -455,8 +455,8 @@ class CinnamonInhibitApplet extends Applet.IconApplet {`
`455`	`455`	`}`
`456`	`456`
`457`	`457`	`on_applet_removed_from_panel() {`
`458`		`- Main.keybindingManager.removeHotKey("inhibit-power-" + this.instance_id);`
`459`		`- Main.keybindingManager.removeHotKey("inhibit-notifications-" + this.instance_id);`
	`458`	`+ Main.keybindingManager.removeXletHotKey(this, "inhibit-power");`
	`459`	`+ Main.keybindingManager.removeXletHotKey(this, "inhibit-notifications");`
`460`	`460`	`this.inhibitSwitch.kill();`
`461`	`461`	`}`
`462`	`462`
Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {`
`1236`	`1236`	`}`
`1237`	`1237`
`1238`	`1238`	`_updateKeybinding() {`
`1239`		`- Main.keybindingManager.addHotKey("overlay-key-" + this.instance_id, this.overlayKey, () => {`
	`1239`	`+ Main.keybindingManager.addXletHotKey(this, "overlay-key", this.overlayKey, () => {`
`1240`	`1240`	`if (!Main.overview.visible && !Main.expo.visible) {`
`1241`	`1241`	`if (this.forceShowPanel && !this.isOpen) {`
`1242`	`1242`	`this.panel.peekPanel();`
`@@ -1359,7 +1359,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {`
`1359`	`1359`	`}`
`1360`	`1360`
`1361`	`1361`	`on_applet_removed_from_panel () {`
`1362`		`- Main.keybindingManager.removeHotKey("overlay-key-" + this.instance_id);`
	`1362`	`+ Main.keybindingManager.removeXletHotKey(this, "overlay-key");`
`1363`	`1363`	`}`
`1364`	`1364`
`1365`	`1365`	`// settings button callbacks`
Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,13 @@ class CinnamonNotificationsApplet extends Applet.TextIconApplet {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`_setKeybinding() {`
`50`		`- Main.keybindingManager.addHotKey("notification-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));`
`51`		`- Main.keybindingManager.addHotKey("notification-clear-" + this.instance_id, this.keyClear, Lang.bind(this, this._clear_all));`
	`50`	`+ Main.keybindingManager.addXletHotKey(this, "notification-open", this.keyOpen, Lang.bind(this, this._openMenu));`
	`51`	`+ Main.keybindingManager.addXletHotKey(this, "notification-clear", this.keyClear, Lang.bind(this, this._clear_all));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`on_applet_removed_from_panel () {`
`55`		`- Main.keybindingManager.removeHotKey("notification-open-" + this.instance_id);`
`56`		`- Main.keybindingManager.removeHotKey("notification-clear-" + this.instance_id);`
	`55`	`+ Main.keybindingManager.removeXletHotKey(this, "notification-open");`
	`56`	`+ Main.keybindingManager.removeXletHotKey(this, "notification-clear");`
`57`	`57`	`global.settings.disconnect(this.panelEditModeHandler);`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class CinnamonSettingsExampleApplet extends Applet.TextIconApplet {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`on_keybinding_changed() {`
`56`		`- Main.keybindingManager.addHotKey("must-be-unique-id", this.keybinding, Lang.bind(this, this.on_hotkey_triggered));`
	`56`	`+ Main.keybindingManager.addXletHotKey(this, "must-be-unique-id", this.keybinding, Lang.bind(this, this.on_hotkey_triggered));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`on_settings_changed() {`
`@@ -129,6 +129,7 @@ class CinnamonSettingsExampleApplet extends Applet.TextIconApplet {`
`129`	`129`	`this.settings.finalize(); // This is called when a user removes the applet from the panel.. we want to`
`130`	`130`	`// Remove any connections and file listeners here, which our settings object`
`131`	`131`	`// has a few of`
	`132`	`+ Main.keybindingManager.removeXletHotKey(this, "must-be-unique-id");`
`132`	`133`	`}`
`133`	`134`	`}`
`134`	`135`
Original file line number	Diff line number	Diff line change
`@@ -1111,7 +1111,7 @@ class CinnamonSoundApplet extends Applet.TextIconApplet {`
`1111`	`1111`	`}`
`1112`	`1112`
`1113`	`1113`	`_setKeybinding() {`
`1114`		`- Main.keybindingManager.addHotKey("sound-open-" + this.instance_id, this.keyOpen, Lang.bind(this, this._openMenu));`
	`1114`	`+ Main.keybindingManager.addXletHotKey(this, "sound-open", this.keyOpen, Lang.bind(this, this._openMenu));`
`1115`	`1115`	`}`
`1116`	`1116`
`1117`	`1117`	`_on_overamplification_change () {`
`@@ -1141,7 +1141,7 @@ class CinnamonSoundApplet extends Applet.TextIconApplet {`
`1141`	`1141`	`}`
`1142`	`1142`
`1143`	`1143`	`on_applet_removed_from_panel () {`
`1144`		`- Main.keybindingManager.removeHotKey("sound-open-" + this.instance_id);`
	`1144`	`+ Main.keybindingManager.removeXletHotKey(this, "sound-open");`
`1145`	`1145`	`if (this.hideSystray)`
`1146`	`1146`	`this.unregisterSystrayIcons();`
`1147`	`1147`	`if (this._iconTimeoutId) {`