From b04840b4584fbb97ae72068716bcb1b000e9db45 Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Mon, 29 Aug 2022 16:45:56 -0500
Subject: [PATCH] Reimplimented config logic
---
src/core/window.py | 21 +-
src/resources/Main_Window.glade | 436 ------------------
src/resources/stylesheet.css | 8 -
.../usr/share/mouse keyboard/emoji.txt | 0
.../usr/share/mouse keyboard}/icon.png | Bin
.../stylesheet.css | 0
.../share/mouse_keyboard/Main_Window.glade | 436 ------------------
.../share/mouse_keyboard/mouse-keyboard.png | Bin 10224 -> 0 bytes
8 files changed, 18 insertions(+), 883 deletions(-)
delete mode 100644 src/resources/Main_Window.glade
delete mode 100644 src/resources/stylesheet.css
rename src/resources/Unicode Emoji List.txt => user_config/usr/share/mouse keyboard/emoji.txt (100%)
rename {src/resources => user_config/usr/share/mouse keyboard}/icon.png (100%)
rename user_config/usr/share/{mouse_keyboard => mouse keyboard}/stylesheet.css (100%)
delete mode 100644 user_config/usr/share/mouse_keyboard/Main_Window.glade
delete mode 100644 user_config/usr/share/mouse_keyboard/mouse-keyboard.png
diff --git a/src/core/window.py b/src/core/window.py
index 2d2b0d7..1f268c3 100644
--- a/src/core/window.py
+++ b/src/core/window.py
@@ -15,16 +15,31 @@ from .container import Container
+class MissingConfigError(Exception):
+ pass
+
+
class Window(SignalsMixin, Gtk.ApplicationWindow):
"""docstring for Window."""
def __init__(self, args, unknownargs):
super(Window, self).__init__()
- self._SCRIPT_PTH = os.path.dirname(os.path.realpath(__file__))
- self._ICON_FILE = f"{self._SCRIPT_PTH}/../resources/icon.png"
- self._CSS_FILE = f"{self._SCRIPT_PTH}/../resources/stylesheet.css"
+ self._USER_HOME = os.path.expanduser('~')
+ self._USR_PATH = f"/usr/share/{app_name.lower()}"
+ self._CONFIG_PATH = f"{self._USER_HOME}/.config/{app_name.lower()}"
+ self._ICON_FILE = f"{self._CONFIG_PATH}/icon.png"
+ self._CSS_FILE = f"{self._CONFIG_PATH}/stylesheet.css"
+ if not os.path.exists(self._ICON_FILE):
+ self._ICON_FILE = f"{self._USR_PATH}/icon.png"
+ if not os.path.exists(self._ICON_FILE):
+ raise MissingConfigError("Unable to find the application icon.")
+
+ if not os.path.exists(self._ICON_FILE):
+ self._CSS_FILE = f"{self._USR_PATH}/stylesheet.css"
+ if not os.path.exists(self._ICON_FILE):
+ raise MissingConfigError("Unable to find the stylesheet.")
self.setup_win_settings()
self.setup_styling()
diff --git a/src/resources/Main_Window.glade b/src/resources/Main_Window.glade
deleted file mode 100644
index 7931fad..0000000
--- a/src/resources/Main_Window.glade
+++ /dev/null
@@ -1,436 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/resources/stylesheet.css b/src/resources/stylesheet.css
deleted file mode 100644
index d1acba0..0000000
--- a/src/resources/stylesheet.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* * {
- background: rgba(0, 0, 0, 0.64);
- color: rgba(255, 255, 255, 1);
-}
-
-#popoutkeyboard {
- background-color: rgba(0, 65, 125, 1);
-} */
diff --git a/src/resources/Unicode Emoji List.txt b/user_config/usr/share/mouse keyboard/emoji.txt
similarity index 100%
rename from src/resources/Unicode Emoji List.txt
rename to user_config/usr/share/mouse keyboard/emoji.txt
diff --git a/src/resources/icon.png b/user_config/usr/share/mouse keyboard/icon.png
similarity index 100%
rename from src/resources/icon.png
rename to user_config/usr/share/mouse keyboard/icon.png
diff --git a/user_config/usr/share/mouse_keyboard/stylesheet.css b/user_config/usr/share/mouse keyboard/stylesheet.css
similarity index 100%
rename from user_config/usr/share/mouse_keyboard/stylesheet.css
rename to user_config/usr/share/mouse keyboard/stylesheet.css
diff --git a/user_config/usr/share/mouse_keyboard/Main_Window.glade b/user_config/usr/share/mouse_keyboard/Main_Window.glade
deleted file mode 100644
index 7931fad..0000000
--- a/user_config/usr/share/mouse_keyboard/Main_Window.glade
+++ /dev/null
@@ -1,436 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- False
- Mouse Board
- center
- 260
- icon.png
- toolbar
- True
- True
- False
- center
-
-
- True
- False
- vertical
-
-
- True
- False
-
-
- True
- False
-
-
- True
- True
- 0
-
-
-
-
- 520
- True
- False
-
-
- True
- True
- gtk-go-forward
- False
- False
- Autotype Field...
-
-
- True
- True
- 0
-
-
-
-
- Type
- True
- True
- True
-
-
-
- False
- True
- 1
-
-
-
-
- False
- True
- 1
-
-
-
-
- True
- False
-
-
- True
- True
- 2
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- True
- False
- vertical
-
-
- True
- False
- 10
- 10
- Special Characters
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
- in
-
-
- True
- False
-
-
- True
- False
- vertical
- 10
- start
-
-
-
-
-
-
-
-
-
- True
- True
- 1
-
-
-
-
- False
- True
- 0
-
-
-
-
- popoutkeyboard
- True
- False
- 5
- vertical
- True
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
- True
- 1
-
-
-
-
- True
- False
- 10
- 10
- vertical
-
-
- True
- False
- start
-
-
- Del
- True
- True
- True
-
-
-
- True
- True
- 0
-
-
-
-
- Ctrl
- True
- True
- True
-
-
-
- True
- True
- 1
-
-
-
-
- Shift
- True
- True
- True
-
-
-
- True
- True
- 2
-
-
-
-
- Alt
- True
- True
- True
-
-
-
- True
- True
- 3
-
-
-
-
- PrtSc
- True
- True
- False
-
-
-
- True
- True
- 4
-
-
-
-
- gtk-add
- True
- True
- True
- True
-
-
- True
- True
- 5
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- True
- in
-
-
- True
- False
-
-
- True
- True
- commands
-
-
-
-
-
- Commands
-
-
-
- 0
-
-
-
-
-
-
-
-
-
-
- True
- True
- 1
-
-
-
-
-
- True
- False
- True
-
-
- Up
- True
- True
- True
-
-
-
- 1
- 0
-
-
-
-
- Down
- True
- True
- True
-
-
-
- 1
- 2
-
-
-
-
- Left
- True
- True
- True
-
-
-
- 0
- 1
-
-
-
-
- Right
- True
- True
- True
-
-
-
- 2
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
- True
- 2
-
-
-
-
- False
- True
- 2
-
-
-
-
- True
- True
- 1
-
-
-
-
-
-
diff --git a/user_config/usr/share/mouse_keyboard/mouse-keyboard.png b/user_config/usr/share/mouse_keyboard/mouse-keyboard.png
deleted file mode 100644
index bcf986ea8ed78737ede3b3732eeb173501a10b7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10224
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