Merge branch 'fix/stylePath' into 'master'

fixed style path problem

See merge request applications/manjaro-hello!87
This commit is contained in:
Stefano Capitani
2021-07-15 15:52:28 +00:00
4 changed files with 30 additions and 26 deletions
+1
View File
@@ -9,6 +9,7 @@
"logo_path": "/usr/share/icons/hicolor/64x64/apps/manjaro.png",
"save_path": "~/.config/manjaro-hello.json",
"ui_path": "/usr/share/manjaro-hello/ui/manjaro-hello.glade",
"style_path": "/usr/share/manjaro-hello/ui/style.css",
"urls": {
"development": "https://gitlab.manjaro.org",
"discover": "https://discover.manjaro.org/",
+6 -3
View File
@@ -99,9 +99,6 @@ class Hello(Gtk.Window):
self.app = "manjaro-hello"
self.dev = "--dev" in sys.argv # Dev mode activated ?
screen = Gdk.Screen.get_default()
provider = Gtk.CssProvider()
provider.load_from_path(os.path.abspath("src/style.css"))
Gtk.StyleContext.add_provider_for_screen(screen, provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
# Load preferences
if self.dev:
@@ -110,6 +107,7 @@ class Hello(Gtk.Window):
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"
else:
self.preferences = read_json(f"/usr/share/{self.app}/data/preferences.json")
# Get saved infos
@@ -117,6 +115,11 @@ class Hello(Gtk.Window):
if not self.save:
self.save = {"locale": None}
# Import Css
provider = Gtk.CssProvider()
provider.load_from_path(self.preferences["style_path"])
Gtk.StyleContext.add_provider_for_screen(screen, provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
# Init window
self.builder = Gtk.Builder.new_from_file(self.preferences["ui_path"])
self.builder.connect_signals(self)
View File
View File