PluginWindow: Add accels to close

blueman/gui/applet/PluginDialog.py

@@ -10,9 +10,8 @@
 
 import gi
 gi.require_version("Gtk", "3.0")
-from gi.repository import Gtk
 gi.require_version("Gdk", "3.0")
-from gi.repository import Gdk
+from gi.repository import Gtk, Gdk, Gio
 
 if TYPE_CHECKING:
     from blueman.main.Applet import BluemanApplet
@@ -89,9 +88,10 @@ def get_control_widget(self, opt: str, params: "Option") -> Gtk.Widget:
         raise ValueError()
 
 
-class PluginDialog(Gtk.Window):
-    def __init__(self, applet: "BluemanApplet") -> None:
+class PluginDialog(Gtk.ApplicationWindow):
+    def __init__(self, applet: "BluemanApplet", application: Gtk.Application) -> None:
         super().__init__(
+            application=application,
             title=_("Plugins"),
             icon_name="blueman",
             name="PluginDialog",
@@ -163,6 +163,10 @@ def __init__(self, applet: "BluemanApplet") -> None:
 
         self.list.set_cursor(0)
 
+        close_action = Gio.SimpleAction.new("close", None)
+        close_action.connect("activate", lambda x, y: self.close())
+        self.add_action(close_action)
+
     def list_compare_func(self, _treemodel: Gtk.TreeModel, iter1: Gtk.TreeIter, iter2: Gtk.TreeIter, _user_data: object
                           ) -> int:
         a = self.list.get(iter1, "activatable", "name")

blueman/main/Applet.py

@@ -1,4 +1,7 @@
-from gi.repository import Gio, GLib
+import gi
+gi.require_version("Gtk", "3.0")
+
+from gi.repository import Gio, GLib, Gtk
 import logging
 import signal
 from typing import Any, cast
@@ -19,7 +22,7 @@
 from blueman.plugins.applet.StatusIcon import StatusIcon
 
 
-class BluemanApplet(Gio.Application):
+class BluemanApplet(Gtk.Application):
     def __init__(self) -> None:
         super().__init__(application_id="org.blueman.Applet", flags=Gio.ApplicationFlags.FLAGS_NONE)
         setup_icon_path()
@@ -60,6 +63,10 @@ def do_quit(_: object) -> bool:
         self._any_device = AnyDevice()
         self._any_device.connect_signal('property-changed', self._on_device_property_changed)
 
+    def do_startup(self) -> None:
+        Gtk.Application.do_startup(self)
+        self.set_accels_for_action("win.close", ["<Ctrl>w", "Escape"])
+
     def do_activate(self) -> None:
         if not self._active:
             self.hold()

blueman/plugins/applet/StandardItems.py

@@ -23,7 +23,7 @@ class StandardItems(AppletPlugin, PowerStateListener):
     __author__ = "walmis"
 
     def on_load(self) -> None:
-        self._plugin_window: Optional[Gtk.Window] = None
+        self._plugin_window: Optional[Gtk.ApplicationWindow] = None
 
         self.parent.Plugins.Menu.add(self, 21)
 
@@ -107,6 +107,6 @@ def on_close(win: Gtk.Window, _event: Gdk.Event) -> bool:
         if self._plugin_window:
             self._plugin_window.present()
         else:
-            self._plugin_window = PluginDialog(self.parent)
+            self._plugin_window = PluginDialog(self.parent, self.parent)
             self._plugin_window.connect("delete-event", on_close)
             self._plugin_window.show()