settings: xdg activation

receive an xdg activation token from the trayicon and use it to activate
the settings window.
this is needed to bring the settings window to the front.

Author: deltragon

safeeyes/context.py

@@ -40,8 +40,8 @@ def __getitem__(self, key: str) -> typing.Callable:
         """This is soft-deprecated - it is preferred to access the property."""
         return getattr(self, key)
 
-    def show_settings(self) -> None:
-        utility.execute_main_thread(self._application.show_settings)
+    def show_settings(self, activation_token: typing.Optional[str] = None) -> None:
+        utility.execute_main_thread(self._application.show_settings, activation_token)
 
     def show_about(self) -> None:
         utility.execute_main_thread(self._application.show_about)

safeeyes/plugins/trayicon/plugin.py

@@ -53,6 +53,10 @@
         <signal name="NewIcon"/>
         <signal name="NewTooltip"/>
 
+        <method name="ProvideXdgActivationToken">
+            <arg name="token" type="s" direction="in"/>
+        </method>
+
         <property name="XAyatanaLabel" type="s" access="read"/>
         <signal name="XAyatanaNewLabel">
             <arg type="s" name="label" direction="out" />
@@ -374,6 +378,8 @@ class StatusNotifierItemService(DBusService):
     ItemIsMenu = True
     Menu = None
 
+    last_activation_token: typing.Optional[str] = None
+
     def __init__(self, session_bus, menu_items):
         super().__init__(
             interface_info=SNI_NODE_INFO,
@@ -424,6 +430,9 @@ def set_xayatanalabel(self, label):
 
         self.emit_signal("XAyatanaNewLabel", (label, ""))
 
+    def ProvideXdgActivationToken(self, token: str) -> None:
+        self.last_activation_token = token
+
 
 class TrayIcon:
     """Create and show the tray icon along with the tray menu."""
@@ -662,12 +671,12 @@ def quit_safe_eyes(self):
             self.idle_condition.release()
         self.quit()
 
-    def show_settings(self):
+    def show_settings(self) -> None:
         """Handle Settings menu action.
 
         This action shows the Settings dialog.
         """
-        self.on_show_settings()
+        self.on_show_settings(self.sni_service.last_activation_token)
 
     def show_about(self):
         """Handle About menu action.

safeeyes/safeeyes.py

@@ -23,6 +23,7 @@
 import atexit
 import logging
 from importlib import metadata
+import typing
 
 import gi
 from safeeyes import context, utility
@@ -52,6 +53,8 @@ class SafeEyes(Gtk.Application):
     plugins_manager: PluginManager
     system_locale: str
 
+    _settings_dialog: typing.Optional[SettingsDialog] = None
+
     def __init__(self, system_locale: str, config) -> None:
         super().__init__(
             application_id="io.github.slgobinath.SafeEyes",
@@ -60,7 +63,6 @@ def __init__(self, system_locale: str, config) -> None:
 
         self.active = False
         self.config = config
-        self.settings_dialog_active = False
         self._status = ""
         self.system_locale = system_locale
 
@@ -314,17 +316,20 @@ def _retry_errored_plugins(self):
 
         GLib.timeout_add_seconds(timeout, self._retry_errored_plugins)
 
-    def show_settings(self):
+    def show_settings(self, activation_token: typing.Optional[str] = None) -> None:
         """Listen to tray icon Settings action and send the signal to Settings
         dialog.
         """
-        if not self.settings_dialog_active:
+        if self._settings_dialog is None:
             logging.info("Show Settings dialog")
-            self.settings_dialog_active = True
-            settings_dialog = SettingsDialog(
+            self._settings_dialog = SettingsDialog(
                 self, self.config.clone(), self.save_settings
             )
-            settings_dialog.show()
+
+        if activation_token is not None:
+            self._settings_dialog.set_startup_id(activation_token)
+
+        self._settings_dialog.show()
 
     def show_required_plugin_dialog(self, error: RequiredPluginException) -> None:
         self.required_plugin_dialog_active = True
@@ -435,7 +440,7 @@ def save_settings(self, config):
         """Listen to Settings dialog Save action and write to the config
         file.
         """
-        self.settings_dialog_active = False
+        self._settings_dialog = None
 
         if self.config == config:
             # Config is not modified

safeeyes/ui/settings_dialog.py

@@ -266,7 +266,7 @@ def __show_break_properties_dialog(
 
     def show(self) -> None:
         """Show the SettingsDialog."""
-        super().show()
+        self.present()
 
     @Gtk.Template.Callback()
     def on_switch_postpone_activate(self, switch, state) -> None: