This commit is contained in:
Vitor Lopes
2024-04-28 10:46:11 +01:00
parent e27324bc02
commit 9b51a4a338
Regular → Executable
+12 -8
View File
@@ -119,17 +119,21 @@ class Hello(Gtk.Window):
def __init__(self): def __init__(self):
Gtk.Window.__init__(self, title="Manjaro Hello", border_width=6) Gtk.Window.__init__(self, title="Manjaro Hello", border_width=6)
self.app = "manjaro-hello" self.app = "manjaro-hello"
self.dev = "--dev" in sys.argv # Dev mode activated ?
screen = Gdk.Screen.get_default() screen = Gdk.Screen.get_default()
# Load preferences self.dev = "--dev" in sys.argv
if self.dev: if self.dev:
self.preferences = read_json("data/preferences.json") # dont load hardcoded path in devmode
self.preferences["data_path"] = "data/" path = os.getcwd()
self.preferences["desktop_path"] = os.getcwd() + f"/{self.app}.desktop" parent = os.path.abspath(os.path.join(path, os.pardir))
self.preferences["locale_path"] = "locale/" data = f"{parent}/data/"
self.preferences["ui_path"] = f"ui/{self.app}.glade" ui = f"{parent}/ui/"
self.preferences["style_path"] = f"ui/style.css" self.preferences = read_json(f"{data}preferences.json")
self.preferences["data_path"] = f"{data}"
self.preferences["desktop_path"] = f"{parent}/{self.app}.desktop"
self.preferences["locale_path"] = f"{parent}/locale/"
self.preferences["ui_path"] = f"{ui}{self.app}.glade"
self.preferences["style_path"] = f"{ui}style.css"
else: else:
self.preferences = read_json(f"/usr/share/{self.app}/data/preferences.json") self.preferences = read_json(f"/usr/share/{self.app}/data/preferences.json")
# Get saved infos # Get saved infos