SettingsManager and StateManager working impls

gnome/breezydesktop@org.xronlinux/metadata.json

@@ -2,7 +2,7 @@
     "uuid": "breezydesktop@org.xronlinux",
     "name": "Breezy GNOME XR Desktop",
     "description": "XR virtual desktop for GNOME.",
-    "settings-schema": "org.gnome.shell.extensions.breezy-desktop",
+    "settings-schema": "com.xronlinux.BreezyDesktop",
     "shell-version": [
         "45", "46"
     ],

gnome/breezydesktop@org.xronlinux/schemas/com.xronlinux.BreezyDesktop.gschema.xml

@@ -1,5 +1,6 @@
-<schemalist gettext-domain="breezydesktop@org.xronlinux">
-  <schema id="org.gnome.shell.extensions.breezy-desktop" path="/org/gnome/shell/extensions/breezy-desktop/">
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="breezydesktop">
+	<schema id="com.xronlinux.BreezyDesktop" path="/com/xronlinux/BreezyDesktop/">
     <key name="effect-enable" type="b">
       <default>
         true
@@ -54,5 +55,5 @@
         End distance when using the "toggle display distance" shortcut.
       </description>
     </key>
-  </schema>
+	</schema>
 </schemalist>

ui/.python-version

@@ -0,0 +1 @@
+3.11.9

ui/src/SettingsManager.py

@@ -0,0 +1,15 @@
+
+from gi.repository import Gio
+
+class SettingsManager:
+    _instance = None
+
+    @staticmethod
+    def get_instance():
+        if not SettingsManager._instance:
+            SettingsManager._instance = SettingsManager()
+
+        return SettingsManager._instance
+
+    def __init__(self):
+        self.settings = Gio.Settings.new_with_path("com.xronlinux.BreezyDesktop", "/com/xronlinux/BreezyDesktop/")

ui/src/StateManager.py

@@ -0,0 +1,54 @@
+import threading
+from gi.repository import GObject
+from .XRDriverIPC import XRDriverIPC
+
+class Logger:
+    def info(self, message):
+        print(message)
+
+    def error(self, message):
+        print(message)
+
+class StateManager(GObject.GObject):
+    __gsignals__ = {
+        'device_update': (GObject.SIGNAL_RUN_FIRST, None, (str,))
+    }
+
+    _instance = None
+
+    @staticmethod
+    def get_instance():
+        if not StateManager._instance:
+            StateManager._instance = StateManager()
+
+        return StateManager._instance
+
+    @staticmethod
+    def device_name(state):
+        if state.get('connected_device_brand') and state.get('connected_device_model'):
+            return f"{state['connected_device_brand']} {state['connected_device_model']}"
+
+        return None
+
+    def __init__(self):
+        GObject.GObject.__init__(self)
+        self.ipc = XRDriverIPC(logger = Logger(), user="wayne", user_home="/home/wayne")
+        self.connected_device_name = None
+
+        self.start()
+
+    def start(self):
+        self.running = True
+        self._refresh_state()
+
+    def stop(self):
+        self.running = False
+
+    def _refresh_state(self):
+        self.state = self.ipc.retrieve_driver_state()
+        new_device_name = StateManager.device_name(self.state)
+        if self.connected_device_name != new_device_name:
+            self.connected_device_name = new_device_name
+            self.emit('device_update', self.connected_device_name)
+
+        if self.running: threading.Timer(1.0, self._refresh_state).start()

ui/src/connecteddevice.py

@@ -1,5 +1,5 @@
-from gi.repository import Adw, Gtk
-
+from gi.repository import Adw, Gio, Gtk
+from .SettingsManager import SettingsManager
 
 @Gtk.Template(resource_path='/com/xronlinux/BreezyDesktop/connecteddevice.ui')
 class ConnectedDevice(Gtk.Box):
@@ -16,9 +16,10 @@ class ConnectedDevice(Gtk.Box):
     def __init__(self):
         super(Gtk.Box, self).__init__()
         self.init_template()
+        self.settings = SettingsManager.get_instance().settings
 
-        self.get_settings().bind('display-distance', display_distance_scale, 'value', Gio.SettingsBindFlags.DEFAULT)
-        self.get_settings().bind('effect-enable', effect_enable_switch, 'active', Gio.SettingsBindFlags.DEFAULT)
+        self.settings.bind('display-distance', self.display_distance_scale, 'value', Gio.SettingsBindFlags.DEFAULT)
+        self.settings.bind('effect-enable', self.effect_enable_switch, 'active', Gio.SettingsBindFlags.DEFAULT)
 
     def set_device_name(self, name):
         self.device_label.set_markup(f"<b>{name}</b>")

ui/src/connecteddevice.ui

@@ -41,7 +41,7 @@
           <object class="AdwActionRow">
             <property name="title" translatable="true">Display distance</property>
             <child>
-              <object class="GtkScale" id="display_distance_scale">
+              <object class="GtkScale">
                 <property name="valign">3</property>
                 <property name="draw-value">true</property>
                 <property name="value-pos">0</property>
@@ -49,7 +49,7 @@
                 <property name="width-request">350</property>
                 <property name="has-origin">false</property>
                 <property name="adjustment">
-                  <object class="GtkAdjustment" id="display-distance-slider">
+                  <object class="GtkAdjustment" id="display_distance_scale">
                     <property name="lower">0.2</property>
                     <property name="upper">2.5</property>
                     <property name="step-increment">0.01</property>

ui/src/main.py

@@ -19,7 +19,6 @@
 
 import sys
 import gi
-import threading
 
 gi.require_version('Gtk', '4.0')
 gi.require_version('Adw', '1')
@@ -27,16 +26,6 @@ gi.require_version('Gio', '2.0')
 
 from gi.repository import Adw, Gtk, Gio
 from .window import BreezydesktopWindow
-from .nodevice import NoDevice
-from .connecteddevice import ConnectedDevice
-from .XRDriverIPC import XRDriverIPC
-
-class Logger:
-    def info(self, message):
-        print(message)
-
-    def error(self, message):
-        print(message)
 
 class BreezydesktopApplication(Adw.Application):
     """The main application singleton class."""
@@ -46,8 +35,6 @@ class BreezydesktopApplication(Adw.Application):
                          flags=Gio.ApplicationFlags.DEFAULT_FLAGS)
         self.create_action('quit', lambda *_: self.quit(), ['<primary>q'])
         self.create_action('about', self.on_about_action)
-        self.ipc = XRDriverIPC(logger = Logger(), user="wayne", user_home="/home/wayne")
-        self.settings = Gio.Settings.new_with_path("com.xronlinux.BreezyDesktop", "/com/xronlinux/BreezyDesktop/")
 
     def do_activate(self):
         """Called when the application is activated.
@@ -58,15 +45,8 @@ class BreezydesktopApplication(Adw.Application):
         win = self.props.active_window
         if not win:
             win = BreezydesktopWindow(application=self)
-        win.set_settings(self.settings)
         win.present()
 
-        self._refresh_driver_state()
-
-    def _refresh_driver_state(self):
-        self.props.active_window.set_state(self.ipc.retrieve_driver_state())
-        threading.Timer(1.0, self._refresh_driver_state).start()
-
     def on_about_action(self, widget, _):
         """Callback for the app.about action."""
         about = Gtk.AboutDialog(transient_for=self.props.active_window,

ui/src/meson.build

@@ -31,6 +31,8 @@ breezydesktop_sources = [
   'connecteddevice.py',
   'main.py',
   'nodevice.py',
+  'SettingsManager.py',
+  'StateManager.py',
   'window.py',
   'XRDriverIPC.py'
 ]

ui/src/window.py

@@ -18,6 +18,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from gi.repository import Gtk
+from .StateManager import StateManager
+from .connecteddevice import ConnectedDevice
+from .nodevice import NoDevice
 
 @Gtk.Template(resource_path='/com/xronlinux/BreezyDesktop/window.ui')
 class BreezydesktopWindow(Gtk.ApplicationWindow):
@@ -30,14 +33,16 @@ class BreezydesktopWindow(Gtk.ApplicationWindow):
         super().__init__(**kwargs)
         self.init_template()
 
-    def set_settings(self, settings):
-        self.settings = settings
+        state_manager = StateManager.get_instance()
+        state_manager.connect('device_update', self._handle_device_update)
 
-    def set_state(self, state):
-        if state.get('connected_device_brand') and state.get('connected_device_model'):
+        self._handle_device_update(state_manager, StateManager.device_name(state_manager.state))
+
+    def _handle_device_update(self, state_manager, connected_device_name):
+        if connected_device_name:
             self.connected_device.set_visible(True)
             self.no_device.set_visible(False)
-            self.connected_device.set_device_name(f"{state['connected_device_brand']} {state['connected_device_model']}")
+            self.connected_device.set_device_name(connected_device_name)
         else:
             self.connected_device.set_visible(False)
             self.no_device.set_visible(True)