diff --git a/data/preferences.json b/data/preferences.json index 5cfb7ae..e26a26d 100644 --- a/data/preferences.json +++ b/data/preferences.json @@ -15,7 +15,6 @@ "style_path": "/usr/share/manjaro-hello/ui/style.css", "urls": { "development": "https://gitlab.manjaro.org", - "software": "https://software.manjaro.org/", "donate": "https://manjaro.org/donate", "facebook": "https://www.facebook.com/ManjaroLinux", "forum": "https://forum.manjaro.org", diff --git a/po/manjaro-hello.pot b/po/manjaro-hello.pot index 6820c04..0b08dfd 100644 --- a/po/manjaro-hello.pot +++ b/po/manjaro-hello.pot @@ -69,10 +69,6 @@ msgstr "" msgid "Forums" msgstr "" -#: ../ui/manjaro-hello.glade:207 -msgid "Software" -msgstr "" - #: ../ui/manjaro-hello.glade:224 msgid "Mailing lists" msgstr "" diff --git a/src/manjaro_hello.py b/src/manjaro_hello.py old mode 100644 new mode 100755 index a60551d..4d3ea6a --- a/src/manjaro_hello.py +++ b/src/manjaro_hello.py @@ -119,17 +119,21 @@ class Hello(Gtk.Window): def __init__(self): Gtk.Window.__init__(self, title="Manjaro Hello", border_width=6) self.app = "manjaro-hello" - self.dev = "--dev" in sys.argv # Dev mode activated ? screen = Gdk.Screen.get_default() - # Load preferences + self.dev = "--dev" in sys.argv if self.dev: - self.preferences = read_json("data/preferences.json") - self.preferences["data_path"] = "data/" - self.preferences["desktop_path"] = os.getcwd() + f"/{self.app}.desktop" - self.preferences["locale_path"] = "locale/" - self.preferences["ui_path"] = f"ui/{self.app}.glade" - self.preferences["style_path"] = f"ui/style.css" + # dont load hardcoded path in devmode + path = os.getcwd() + parent = os.path.abspath(os.path.join(path, os.pardir)) + data = f"{parent}/data/" + ui = f"{parent}/ui/" + 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: self.preferences = read_json(f"/usr/share/{self.app}/data/preferences.json") # Get saved infos @@ -266,13 +270,12 @@ class Hello(Gtk.Window): "label": { "autostartlabel", "development", - "software", "donate", "firstcategory", "forum", "install", "installlabel", - "rescue" , + "rescue", "involved", "mailling", "readme", @@ -286,7 +289,6 @@ class Hello(Gtk.Window): "tooltip_text": { "about", "development", - "software", "donate", "forum", "mailling", diff --git a/ui/manjaro-hello.glade b/ui/manjaro-hello.glade index 838032f..b453391 100644 --- a/ui/manjaro-hello.glade +++ b/ui/manjaro-hello.glade @@ -198,23 +198,6 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we 5 - - - True - False - right - Software - software - True - Web resource - True - - - - 1 - 6 - - True @@ -228,7 +211,7 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - 1 + 2 7 @@ -262,8 +245,8 @@ We, the Manjaro Developers, hope that you will enjoy using Manjaro as much as we - 2 - 7 + 1 + 6