meldapp: Move custom CSS provider initialisation into MeldApp

Author: kaiw

bin/meld

@@ -256,8 +256,6 @@ def check_requirements():
 
 def setup_resources():
     from gi.repository import Gio
-    from gi.repository import Gtk
-    from gi.repository import Gdk
     from gi.repository import GtkSource
 
     resource_filename = meld.conf.APPLICATION_ID + ".gresource"
@@ -282,12 +280,6 @@ def setup_resources():
         if not uninstalled:
             raise
 
-    provider = Gtk.CssProvider()
-    provider.load_from_resource('/org/gnome/meld/meld.css')
-    Gtk.StyleContext.add_provider_for_screen(
-        Gdk.Screen.get_default(), provider,
-        Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-
     style_path = os.path.join(meld.conf.DATADIR, "styles")
     GtkSource.StyleSchemeManager.get_default().append_search_path(style_path)
 

meld/meldapp.py

@@ -49,6 +49,15 @@ def __init__(self):
         Gtk.Window.set_default_icon_name(meld.conf.APPLICATION_ID)
         self.set_resource_base_path(meld.conf.RESOURCE_BASE)
 
+        provider = Gtk.CssProvider()
+        provider.load_from_resource(self.make_resource_path('meld.css'))
+        Gtk.StyleContext.add_provider_for_screen(
+            Gdk.Screen.get_default(), provider,
+            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
+
+    def make_resource_path(self, resource_path: str) -> str:
+        return f'{self.props.resource_base_path}/{resource_path}'
+
     def do_startup(self):
         Gtk.Application.do_startup(self)
         meld.accelerators.register_accels(self)