Refactoring and some bug fixes

src/utils/CrossClassSignals.py

@@ -1,11 +1,11 @@
-# Gtk imports
-from gi.repository import GLib as glib
-
 # Python imports
 import os, threading, time, datetime
 
+# Lib imports
+from gi.repository import GLib
 import pyscreenshot as capture
 
+
 # Application imports
 
 
@@ -18,10 +18,10 @@ def threaded(fn):
 
 class CrossClassSignals:
     def __init__(self, settings):
-        self.settings     = settings
-        self.builder      = self.settings.returnBuilder()
+        self.settings        = settings
+        self.builder         = self.settings.returnBuilder()
         self.SCREENSHOTS_DIR = self.settings.returnScreenshotsDir()
-        self.fileStore    = self.builder.get_object("fileStore")
+        self.fileStore       = self.builder.get_object("fileStore")
         self.refreshingState = False
 
 
@@ -40,7 +40,7 @@ class CrossClassSignals:
         if len(images) != len(self.fileStore):
             self.fileStore.clear()
             for image in images:
-                glib.idle_add(self.addToStore, (image))
+                GLib.idle_add(self.addToStore, (image))
 
         # self.fileStore.sort()
         self.refreshingState = False

src/utils/Settings.py

@@ -1,36 +1,52 @@
-# Gtk imports
+# Python imports
+import os
+
+# Lib imports
 import gi, cairo
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
 
-from gi.repository import Gtk as gtk
-from gi.repository import Gdk as gdk
+from gi.repository import Gtk
+from gi.repository import Gdk
 
-# Python imports
-import os
 
 # Application imports
 
 
 class Settings:
     def __init__(self):
-        self.SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__)) + "/"
-        self.builder = gtk.Builder()
-        self.builder.add_from_file(self.SCRIPT_PTH + "../resources/Main_Window.glade")
+        self._SCRIPT_PTH     = os.path.dirname(os.path.realpath(__file__))
+        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.SCREENSHOTS_DIR = f"{self._USER_HOME}/.screenshots"
+
+        if not os.path.exists(self._CONFIG_PATH):
+            os.mkdir(self._CONFIG_PATH)
+        if not os.path.exists(self._GLADE_FILE):
+            self._GLADE_FILE   = f"{self._USR_PATH}/Main_Window.glade"
+        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.lower()}.png"
+        if not os.path.isdir(self.SCREENSHOTS_DIR):
+            os.mkdir(self.SCREENSHOTS_DIR)
 
         # 'Filters'
         self.images = ('.png', '.jpg', '.jpeg', '.gif')
-        HOME_PATH   = os.path.expanduser('~')
-        self.SCREENSHOTS_DIR = HOME_PATH + "/" + ".screenshots"
 
-        if not os.path.isdir(self.SCREENSHOTS_DIR):
-            os.mkdir(self.SCREENSHOTS_DIR)
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file(self._GLADE_FILE)
 
 
     def createWindow(self):
         # Get window and connect signals
         window = self.builder.get_object("Main_Window")
-        window.connect("delete-event", gtk.main_quit)
+        window.connect("delete-event", Gtk.main_quit)
         self.setWindowData(window)
         return window
 
@@ -42,17 +58,17 @@ class Settings:
             window.set_visual(visual)
 
         # bind css file
-        cssProvider  = gtk.CssProvider()
-        cssProvider.load_from_path(self.SCRIPT_PTH + '../resources/stylesheet.css')
-        screen       = gdk.Screen.get_default()
-        styleContext = gtk.StyleContext()
-        styleContext.add_provider_for_screen(screen, cssProvider, gtk.STYLE_PROVIDER_PRIORITY_USER)
+        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 getMonitorData(self):
         screen      = self.builder.get_object("Main_Window").get_screen()
         wdth        = screen.get_width()
         hght        = screen.get_height()
-        mon0        = gdk.Rectangle()
+        mon0        = Gdk.Rectangle()
         mon0.width  = wdth
         mon0.height = hght
         monitors    = []