OOPing it more: Removed gui_communication/settings.py

wobuzz/gui.py

@@ -10,6 +10,7 @@ class GUI:
         self.app = app
 
         self.window = MainWindow()
+        self.settings = self.window.settings
 
         self.window.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.app.library.main_library_dock)
 
@@ -28,6 +29,11 @@ class GUI:
 
         self.window.show()
 
+        self.settings.update_all()
+
     def connect(self):
         self.window.closeEvent = self.app.utils.on_close
 
+    def on_settings_change(self, key, value):
+        self.settings.update_settings(key, value)
+

wobuzz/gui_communication/gui_communication.py

@@ -2,7 +2,6 @@
 
 from .menu_bar import MenuBar
 from .track_control import TrackControl
-from .settings import Settings
 
 
 class GUICommunication:
@@ -15,9 +14,6 @@ class GUICommunication:
 
         self.menu_bar = MenuBar(self.app)
         self.track_control = TrackControl(self.app)
-        self.settings = Settings(self.app)
-
-        self.settings.update_all()
 
     def on_track_change(self, previous_track=None, track=None):
         self.track_control.on_track_change(previous_track, track)
@@ -26,6 +22,3 @@ class GUICommunication:
     def on_playstate_update(self):
         self.track_control.on_playstate_update()
 
-    def on_settings_change(self, key, value):
-        self.settings.update_settings(key, value)
-

wobuzz/gui_communication/settings.py

@@ -1,26 +0,0 @@
-#!/usr/bin/python3
-
-
-class Settings:
-    def __init__(self, app):
-        self.app = app
-
-        self.settings = self.app.gui.window.settings
-
-        self.connect()
-
-    def connect(self):
-        self.settings.visibilityChanged.connect(self.update_all)
-        self.settings.save_button.pressed.connect(self.write_settings)
-
-    def update_all(self, _=True):  # ignore visible parameter passed by visibilityChanged event
-        self.settings.file_settings.library_path_input.setText(self.app.settings.library_path)
-
-    def update_settings(self, key, value):
-        match key:
-            case "library_path":
-                self.settings.file_settings.library_path_input.setText(value)
-
-    def write_settings(self):
-        self.app.settings.library_path = self.settings.file_settings.library_path_input.text()
-

wobuzz/main.py

@@ -26,7 +26,7 @@ class Wobuzz:
         self.gui_communication = GUICommunication(self)
 
     def on_settings_change(self, key, value):
-        self.gui_communication.on_settings_change(key, value)
+        self.gui.on_settings_change(key, value)
 
         return True
 

wobuzz/ui/settings/settings.py

@@ -6,9 +6,11 @@ from .file import FileSettings
 
 
 class Settings(QDockWidget):
-    def __init__(self, parent=None):
+    def __init__(self, app, parent=None):
         super().__init__(parent)
 
+        self.app = app
+
         self.setAllowedAreas(
             Qt.DockWidgetArea.LeftDockWidgetArea |
             Qt.DockWidgetArea.RightDockWidgetArea |
@@ -32,3 +34,17 @@ class Settings(QDockWidget):
 
         self.setWidget(self.content)
 
+        self.visibilityChanged.connect(self.update_all)
+        self.save_button.pressed.connect(self.write_settings)
+
+    def update_all(self, _=True):  # ignore visible parameter passed by visibilityChanged event
+        self.file_settings.library_path_input.setText(self.app.settings.library_path)
+
+    def update_settings(self, key, value):
+        match key:
+            case "library_path":
+                self.file_settings.library_path_input.setText(value)
+
+    def write_settings(self):
+        self.app.settings.library_path = self.file_settings.library_path_input.text()
+