Add theme-aware tray icons with live XDG portal color-scheme support (#5)

* refactor: use theme-aware symbolic tray icons with portal-based dark/light detection

Replace the hardcoded grey (#5a5a5a) SVG tray icons with two
theme-variant icon sets: white icons for dark panels and dark icons for
light panels.  The active variant is selected at startup by reading the
color-scheme from the XDG desktop portal (org.freedesktop.appearance),
falling back to a GTK theme-name heuristic when the portal is
unavailable.

A D-Bus signal subscription on SettingChanged provides live icon
switching whenever the user toggles between dark and light mode.

https://claude.ai/code/session_01QQf7jwTUQUMVL5R7h9BiNA

* refactor: use freedesktop symbolic icon names instead of embedded SVGs

Replace the generated SVG icons and theme detection machinery with
standard freedesktop symbolic icon names (system-lock-screen-symbolic,
security-high-symbolic, network-offline-symbolic).  The -symbolic suffix
tells the desktop environment to recolor the icons automatically for the
current panel theme, eliminating the need for temp directories, portal
watchers, and manual dark/light detection.

https://claude.ai/code/session_01QQf7jwTUQUMVL5R7h9BiNA

* style: apply ruff formatting to tray.py

https://claude.ai/code/session_01QQf7jwTUQUMVL5R7h9BiNA

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: Reidond

src/bwssh/tray.py

@@ -13,7 +13,6 @@
 import logging
 import shutil
 import subprocess
-import tempfile
 from pathlib import Path
 from typing import Any
 
@@ -172,73 +171,13 @@ def _appindicator_install_hint() -> str:
 
 _POLL_INTERVAL_SECONDS = 5
 
-# Fallback themed icons used for notifications (these don't appear in panel)
-_NOTIFY_ICON_LOCKED = "system-lock-screen-symbolic"
-_NOTIFY_ICON_UNLOCKED = "security-high-symbolic"
-_NOTIFY_ICON_DISCONNECTED = "network-offline-symbolic"
-
-# ---------------------------------------------------------------------------
-# Icon generation — SVG icons using absolute paths
-# ---------------------------------------------------------------------------
-
-# We write SVG files to a temp directory and pass their *absolute paths*
-# (without extension) as icon names to AppIndicator3.  This is the most
-# reliable approach across desktop environments — it avoids icon theme
-# lookup issues where the tray (a separate process) cannot find the icons.
-#
-# The SVGs use a medium grey (#5a5a5a) fill which is visible on both dark
-# and light panels.  On dark panels it appears as a mid-tone; on light
-# panels it's clearly dark enough to see.
-
-_LOCKED_SVG = """\
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
- viewBox="0 0 24 24">
-  <g fill="none" stroke="#5a5a5a" stroke-width="1.8"
-   stroke-linecap="round" stroke-linejoin="round">
-    <path d="M8 11V7a4 4 0 0 1 8 0v4"/>
-    <rect x="5" y="11" width="14" height="10" rx="2"
-     fill="#5a5a5a" stroke="none"/>
-  </g>
-</svg>"""
-
-_UNLOCKED_SVG = """\
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"
- viewBox="0 0 24 24">
-  <g fill="none" stroke="#5a5a5a" stroke-width="1.8"
-   stroke-linecap="round" stroke-linejoin="round">
-    <path d="M5 12l1.2 7.5A2 2 0 0 0 8.2 21h7.6a2 2 0 0 0 2-1.5L19 12z"/>
-    <path d="M5 12L12 3l7 9"/>
-    <path d="M9.5 15.5l2 2 3.5-4.5"/>
-  </g>
-</svg>"""
-
-_DISCONNECTED_SVG = """\
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-  <g fill="none" stroke="#5a5a5a" stroke-width="1.8" stroke-linecap="round">
-    <circle cx="12" cy="12" r="9"/>
-    <line x1="5.6" y1="5.6" x2="18.4" y2="18.4"/>
-  </g>
-</svg>"""
-
-
-def _create_icon_dir() -> tuple[Path, str, str, str]:
-    """Create a temp directory with SVG icons and return absolute paths.
-
-    Returns ``(icon_dir, locked_path, unlocked_path, disconnected_path)``
-    where each ``*_path`` is an absolute path **without** the ``.svg``
-    extension, suitable for passing directly to ``set_icon_full``.
-    """
-    icon_dir = Path(tempfile.mkdtemp(prefix="bwssh-icons-"))
-
-    locked = icon_dir / "bwssh-locked"
-    unlocked = icon_dir / "bwssh-unlocked"
-    disconnected = icon_dir / "bwssh-disconnected"
-
-    locked.with_suffix(".svg").write_text(_LOCKED_SVG)
-    unlocked.with_suffix(".svg").write_text(_UNLOCKED_SVG)
-    disconnected.with_suffix(".svg").write_text(_DISCONNECTED_SVG)
-
-    return icon_dir, str(locked), str(unlocked), str(disconnected)
+# Symbolic icon names from the freedesktop icon theme.  The ``-symbolic``
+# suffix tells the desktop environment to recolor them automatically for
+# the current panel theme (dark or light) — no manual theme detection
+# or embedded SVGs needed.
+_ICON_LOCKED = "system-lock-screen-symbolic"
+_ICON_UNLOCKED = "security-high-symbolic"
+_ICON_DISCONNECTED = "network-offline-symbolic"
 
 
 # ---------------------------------------------------------------------------
@@ -280,19 +219,11 @@ def __init__(self, socket_path: Path) -> None:
             except Exception:
                 logger.debug("Failed to initialise libnotify", exc_info=True)
 
-        # Generate SVG icons and get their absolute paths (without extension)
-        (
-            self._icon_dir,
-            self._icon_locked,
-            self._icon_unlocked,
-            self._icon_disconnected,
-        ) = _create_icon_dir()
-
-        # Build the indicator — use absolute path so AppIndicator finds the
-        # icon immediately without needing an icon theme lookup.
+        # Build the indicator using a symbolic icon name — the desktop
+        # environment recolors -symbolic icons for the panel theme.
         self._indicator = AppIndicator3.Indicator.new(
             "bwssh",
-            self._icon_disconnected,
+            _ICON_DISCONNECTED,
             AppIndicator3.IndicatorCategory.APPLICATION_STATUS,
         )
         self._indicator.set_status(AppIndicator3.IndicatorStatus.ACTIVE)
@@ -362,13 +293,13 @@ def _notify_state_change(
         if not prev_connected and self._connected:
             if self._locked:
                 self._send_notification(
-                    "Agent Connected", "Vault is locked", _NOTIFY_ICON_LOCKED
+                    "Agent Connected", "Vault is locked", _ICON_LOCKED
                 )
             else:
                 self._send_notification(
                     "Agent Connected",
                     f"Vault is unlocked ({self._key_count} keys)",
-                    _NOTIFY_ICON_UNLOCKED,
+                    _ICON_UNLOCKED,
                 )
             return
 
@@ -377,7 +308,7 @@ def _notify_state_change(
             self._send_notification(
                 "Agent Disconnected",
                 "Daemon is not running",
-                _NOTIFY_ICON_DISCONNECTED,
+                _ICON_DISCONNECTED,
             )
             return
 
@@ -386,15 +317,13 @@ def _notify_state_change(
             self._send_notification(
                 "Vault Unlocked",
                 f"{self._key_count} SSH key(s) loaded",
-                _NOTIFY_ICON_UNLOCKED,
+                _ICON_UNLOCKED,
             )
             return
 
         # Unlocked -> Locked
         if self._connected and prev_locked is False and self._locked is True:
-            self._send_notification(
-                "Vault Locked", "SSH keys cleared", _NOTIFY_ICON_LOCKED
-            )
+            self._send_notification("Vault Locked", "SSH keys cleared", _ICON_LOCKED)
 
     def _send_notification(self, summary: str, body: str, icon: str) -> None:
         """Show a desktop notification via libnotify."""
@@ -409,11 +338,11 @@ def _send_notification(self, summary: str, body: str, icon: str) -> None:
     def _update_icon(self) -> None:
         """Set the tray icon based on current state."""
         if not self._connected:
-            icon = self._icon_disconnected
+            icon = _ICON_DISCONNECTED
         elif self._locked:
-            icon = self._icon_locked
+            icon = _ICON_LOCKED
         else:
-            icon = self._icon_unlocked
+            icon = _ICON_UNLOCKED
 
         self._indicator.set_icon_full(icon, self._status_text())
 
@@ -510,6 +439,4 @@ def _on_quit(self, _item: Any) -> None:
         """Exit the tray application."""
         if self._notifications_enabled:
             _Notify.uninit()
-        # Clean up generated icon files
-        shutil.rmtree(self._icon_dir, ignore_errors=True)
         Gtk.main_quit()

tests/test_tray.py

@@ -17,7 +17,14 @@
 from bwssh.control import ControlError
 
 # The module must always be importable even when AppIndicator3 is missing.
-from bwssh.tray import TRAY_AVAILABLE, TrayIcon, _install_hint_for_os_release
+from bwssh.tray import (
+    _ICON_DISCONNECTED,
+    _ICON_LOCKED,
+    _ICON_UNLOCKED,
+    TRAY_AVAILABLE,
+    TrayIcon,
+    _install_hint_for_os_release,
+)
 
 
 class TestAppIndicatorInstallHint:
@@ -164,17 +171,8 @@ def gi_mocks() -> dict[str, MagicMock]:
 @pytest.fixture
 def gi_patched(
     gi_mocks: dict[str, MagicMock],
-    tmp_path: Path,
 ) -> Generator[dict[str, MagicMock]]:
     """Patch gi libraries on the _tray module for the full test duration."""
-    icon_dir = tmp_path / "icons"
-    icon_dir.mkdir()
-    icon_result = (
-        icon_dir,
-        str(icon_dir / "bwssh-locked"),
-        str(icon_dir / "bwssh-unlocked"),
-        str(icon_dir / "bwssh-disconnected"),
-    )
     with (
         patch("bwssh.tray.TRAY_AVAILABLE", True),
         patch(
@@ -186,7 +184,6 @@ def gi_patched(
         patch("bwssh.tray.GLib", gi_mocks["GLib"], create=True),
         patch("bwssh.tray._NOTIFY_AVAILABLE", True),
         patch("bwssh.tray._Notify", gi_mocks["Notify"], create=True),
-        patch("bwssh.tray._create_icon_dir", return_value=icon_result),
     ):
         yield gi_mocks
 
@@ -327,7 +324,7 @@ def test_icon_disconnected(
         tray._connected = False
         tray._update_icon()
         gi_patched["indicator"].set_icon_full.assert_called_with(
-            tray._icon_disconnected, "bwssh: Daemon not running"
+            _ICON_DISCONNECTED, "bwssh: Daemon not running"
         )
 
     def test_icon_locked(
@@ -339,7 +336,7 @@ def test_icon_locked(
         tray._locked = True
         tray._update_icon()
         gi_patched["indicator"].set_icon_full.assert_called_with(
-            tray._icon_locked, "bwssh: Locked"
+            _ICON_LOCKED, "bwssh: Locked"
         )
 
     def test_icon_unlocked(
@@ -352,7 +349,7 @@ def test_icon_unlocked(
         tray._key_count = 5
         tray._update_icon()
         gi_patched["indicator"].set_icon_full.assert_called_with(
-            tray._icon_unlocked, "bwssh: Unlocked (5 keys)"
+            _ICON_UNLOCKED, "bwssh: Unlocked (5 keys)"
         )
 
 
@@ -730,18 +727,7 @@ def test_no_notification_when_notify_unavailable(
         gi_patched: dict[str, MagicMock],
     ) -> None:
         """Notifications are silently skipped when libnotify is absent."""
-        icon_dir = tmp_path / "icons2"
-        icon_dir.mkdir()
-        icon_result = (
-            icon_dir,
-            str(icon_dir / "bwssh-locked"),
-            str(icon_dir / "bwssh-unlocked"),
-            str(icon_dir / "bwssh-disconnected"),
-        )
-        with (
-            patch("bwssh.tray._NOTIFY_AVAILABLE", False),
-            patch("bwssh.tray._create_icon_dir", return_value=icon_result),
-        ):
+        with patch("bwssh.tray._NOTIFY_AVAILABLE", False):
             t = TrayIcon(tmp_path / "control.sock")
 
         assert t._notifications_enabled is False