Refactored to reduce Glade dependency...

src/utils/settings.py

@@ -1,18 +1,13 @@
 # Python imports
-import os, json
+import os
+import json
+import inspect
 
 # Gtk imports
-import gi, cairo
-gi.require_version('Gtk', '3.0')
-gi.require_version('Gdk', '3.0')
-
-from gi.repository import Gtk
-from gi.repository import Gdk
-
 
 # Application imports
 from .logger import Logger
-from .keybindings import Keybindings
+
 
 
 
@@ -23,7 +18,7 @@ class Settings:
         self._CONFIG_PATH   = f"{self._USER_HOME}/.config/{app_name.lower()}"
         self._PLUGINS_PATH  = f"{self._CONFIG_PATH}/plugins"
         self._GLADE_FILE    = f"{self._CONFIG_PATH}/Main_Window.glade"
-        self._KEY_BINDINGS  = f"{self._CONFIG_PATH}/key-bindings.json"
+        self._KEY_BINDINGS_FILE  = f"{self._CONFIG_PATH}/key-bindings.json"
         self._CSS_FILE      = f"{self._CONFIG_PATH}/stylesheet.css"
         self._DEFAULT_ICONS = f"{self._CONFIG_PATH}/icons"
         self._WINDOW_ICON   = f"{self._DEFAULT_ICONS}/{app_name.lower()}.png"
@@ -36,8 +31,8 @@ class Settings:
 
         if not os.path.exists(self._GLADE_FILE):
             self._GLADE_FILE   = f"{self._USR_PATH}/Main_Window.glade"
-        if not os.path.exists(self._KEY_BINDINGS):
-            self._KEY_BINDINGS  = f"{self._USR_SOLARFM}/key-bindings.json"
+        if not os.path.exists(self._KEY_BINDINGS_FILE):
+            self._KEY_BINDINGS_FILE  = f"{self._USR_PATH}/key-bindings.json"
         if not os.path.exists(self._CSS_FILE):
             self._CSS_FILE     = f"{self._USR_PATH}/stylesheet.css"
         if not os.path.exists(self._WINDOW_ICON):
@@ -57,62 +52,39 @@ class Settings:
         self._warning_color = "#ffa800"
         self._error_color   = "#ff0000"
 
-        self._keybindings = Keybindings()
-        with open(self._KEY_BINDINGS) as file:
-            keybindings = json.load(file)["keybindings"]
-            self._keybindings.configure(keybindings)
+        with open(self._KEY_BINDINGS_FILE) as file:
+            bindings = json.load(file)["keybindings"]
+            keybindings.configure(bindings)
 
-        self._main_window   = None
+        self._builder       = None
         self._logger        = Logger(self._CONFIG_PATH).get_logger()
-        self._builder       = Gtk.Builder()
-        self._builder.add_from_file(self._GLADE_FILE)
+
+        self._trace_debug   = False
+        self._debug         = False
 
 
+    def get_builder(self)          -> any:  return self._builder
+    def set_builder(self, builder) -> any:  self._builder = builder
+    def get_glade_file(self)    -> str:          return self._GLADE_FILE
 
-    def create_window(self) -> None:
-        # Get window and connect signals
-        self._main_window = self._builder.get_object("Main_Window")
-        self.set_window_data()
+    def register_signals_to_builder(self, classes=None):
+        handlers = {}
 
-    def set_window_data(self)  -> None:
-        self._main_window.set_icon_from_file(self._WINDOW_ICON)
-        screen = self._main_window.get_screen()
-        visual = screen.get_rgba_visual()
+        for c in classes:
+            methods = None
+            try:
+                methods = inspect.getmembers(c, predicate=inspect.ismethod)
+                handlers.update(methods)
+            except Exception as e:
+                print(repr(e))
 
-        if visual != None and screen.is_composited():
-            self._main_window.set_visual(visual)
-            self._main_window.set_app_paintable(True)
-            self._main_window.connect("draw", self.draw_area)
+        self._builder.connect_signals(handlers)
 
-        # bind css file
-        cssProvider  = Gtk.CssProvider()
-        cssProvider.load_from_path(self._CSS_FILE)
-        screen       = Gdk.Screen.get_default()
-        styleContext = Gtk.StyleContext()
-        styleContext.add_provider_for_screen(screen, cssProvider, Gtk.STYLE_PROVIDER_PRIORITY_USER)
-
-    def get_monitor_data(self) -> list:
-        screen = self._builder.get_object("Main_Window").get_screen()
-        monitors = []
-        for m in range(screen.get_n_monitors()):
-            monitors.append(screen.get_monitor_geometry(m))
-            print("{}x{}|{}+{}".format(monitor.width, monitor.height, monitor.x, monitor.y))
-
-        return monitors
-
-    def draw_area(self, widget, cr):
-        cr.set_source_rgba(0, 0, 0, 0.54)
-        cr.set_operator(cairo.OPERATOR_SOURCE)
-        cr.paint()
-        cr.set_operator(cairo.OPERATOR_OVER)
-
-
-
-    def get_main_window(self)   -> Gtk.ApplicationWindow: return self._main_window
-    def get_builder(self)       -> Gtk.Builder:  return self._builder
     def get_logger(self)        -> Logger:       return self._logger
-    def get_keybindings(self)   -> Keybindings:  return self._keybindings
     def get_plugins_path(self)  -> str:          return self._PLUGINS_PATH
+    def get_icon_theme(self)    -> str:          return self._ICON_THEME
+    def get_css_file(self)      -> str:          return self._CSS_FILE
+    def get_window_icon(self)   -> str:          return self._WINDOW_ICON
     def get_home_path(self)     -> str:          return self._USER_HOME
 
     # Filter returns
@@ -126,3 +98,13 @@ class Settings:
     def get_success_color(self) -> str:   return self._success_color
     def get_warning_color(self) -> str:   return self._warning_color
     def get_error_color(self)   -> str:   return self._error_color
+
+    def is_trace_debug(self)    -> str:   return self._trace_debug
+    def is_debug(self)          -> str:   return self._debug
+
+
+    def set_trace_debug(self, trace_debug):
+        self._trace_debug = trace_debug
+
+    def set_debug(self, debug):
+        self._debug = debug