From 4d88e706f77b76e28d8e59f4e7310604ebe70981 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Sun, 23 Jan 2022 17:33:52 -0600
Subject: [PATCH] Fixed breaking bugs from refactor

---
 src/__init__.py                       |  2 +-
 src/signal_classes/Controller_Data.py |  1 +
 src/utils/Settings.py                 | 20 ++++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/__init__.py b/src/__init__.py
index 0863a01..56356ba 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -31,7 +31,7 @@ class Main(Builtins):
         settings = Settings()
         settings.create_window()
 
-        controller = Controller(args, unknownargs, settings)
+        controller = Controller(settings, args, unknownargs)
         if not controller:
             raise Exception("Controller exited and doesn't exist...")
 
diff --git a/src/signal_classes/Controller_Data.py b/src/signal_classes/Controller_Data.py
index bf5181e..a58b4cf 100644
--- a/src/signal_classes/Controller_Data.py
+++ b/src/signal_classes/Controller_Data.py
@@ -1,4 +1,5 @@
 # Python imports
+import signal
 
 # Lib imports
 from gi.repository import GLib
diff --git a/src/utils/Settings.py b/src/utils/Settings.py
index 7e12833..1affc0e 100644
--- a/src/utils/Settings.py
+++ b/src/utils/Settings.py
@@ -18,13 +18,13 @@ from . import Logger
 class Settings:
     def __init__(self):
         self._SCRIPT_PTH    = os.path.dirname(os.path.realpath(__file__))
-        self._USR_HOME      = os.path.expanduser('~')
-        self._CONFIG_PATH   = f"{self._USER_HOME}/.config/{app_name}"
-        self._GLADE_FILE    = f"{self.CONFIG_PATH}/Main_Window.glade"
-        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}.png"
-        self._USR_PATH      = "/usr/share/{app_name}"
+        self._USER_HOME     = os.path.expanduser('~')
+        self._CONFIG_PATH   = f"{self._USER_HOME}/.config/{app_name.lower()}"
+        self._GLADE_FILE    = f"{self._CONFIG_PATH}/Main_Window.glade"
+        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"
+        self._USR_PATH      = f"/usr/share/{app_name.lower()}"
 
         self._logger        = Logger().get_logger()
         self._builder       = Gtk.Builder()
@@ -47,8 +47,8 @@ class Settings:
         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):
-            self._WINDOW_ICON  = f"{self._USR_PATH}/icons/{app_name}.png"
-        if not os.path.exists(self.DEFAULT_ICONS):
+            self._WINDOW_ICON  = f"{self._USR_PATH}/icons/{app_name.lower()}.png"
+        if not os.path.exists(self._DEFAULT_ICONS):
             self.DEFAULT_ICONS = f"{self._USR_PATH}/icons"
 
         self._builder.add_from_file(self._GLADE_FILE)
@@ -100,7 +100,7 @@ class Settings:
     def get_builder(self):        return self._builder
     def get_logger(self):         return self._logger
     def get_main_window(self):    return self._main_window
-    def get_home_path(self):      return self._USR_HOME
+    def get_home_path(self):      return self._USER_HOME
 
     # Filter returns
     def get_office_filter(self):  return self.office_filter