move ui to data

src/eepm-play-gui.gresource.xml → data/eepm-play-gui.gresource.xml

@@ -2,8 +2,8 @@
 <gresources>
   <gresource prefix="/ru/eepm/PlayGUI">
     <file>style.css</file>
-    <file preprocess="xml-stripblanks">window.ui</file>
-    <file preprocess="xml-stripblanks">logdialog.ui</file>
-    <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
+    <file preprocess="xml-stripblanks">ui/window.ui</file>
+    <file preprocess="xml-stripblanks">ui/logdialog.ui</file>
+    <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">ui/help-overlay.ui</file>
   </gresource>
 </gresources>

data/meson.build

@@ -12,6 +12,13 @@ if desktop_utils.found()
   test('Validate desktop file', desktop_utils, args: [desktop_file])
 endif
 
+gnome.compile_resources('eepm-play-gui',
+  'eepm-play-gui.gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir,
+)
+
 appstream_file = i18n.merge_file(
         input: 'ru.eepm.PlayGUI.metainfo.xml.in',
        output: 'ru.eepm.PlayGUI.metainfo.xml',

meson.build

@@ -6,8 +6,10 @@ project('eepm-play-gui',
 
 i18n = import('i18n')
 gnome = import('gnome')
+python = import('python')
 
-
+pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
+moduledir = pkgdatadir / 'eepm_play_gui'
 
 subdir('data')
 subdir('src')

src/main.py

@@ -36,11 +36,6 @@ class EepmPlayGuiApplication(Adw.Application):
         self.create_action('quit', lambda *_: self.quit(), ['<primary>q'])
         self.create_action('about', self.on_about_action)
 
-        provider = Gtk.CssProvider()
-        provider.load_from_resource("/ru/eepm/PlayGUI/style.css")
-        display = Gdk.Display.get_default()
-        Gtk.StyleContext.add_provider_for_display(display, provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
-
     def do_activate(self):
         """Called when the application is activated.
 

src/meson.build

-pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
-moduledir = pkgdatadir / 'eepm_play_gui'
-gnome = import('gnome')
-
-gnome.compile_resources('eepm-play-gui',
-  'eepm-play-gui.gresource.xml',
-  gresource_bundle: true,
-  install: true,
-  install_dir: pkgdatadir,
-)
-
-python = import('python')
-
 conf = configuration_data()
 conf.set('PYTHON', python.find_installation('python3').full_path())
 conf.set('VERSION', meson.project_version())

src/window.py

@@ -65,7 +65,7 @@ class ApplicationRow(Adw.ActionRow):
             print("marked-unchanged")
 
 
-@Gtk.Template(resource_path='/ru/eepm/PlayGUI/logdialog.ui')
+@Gtk.Template(resource_path='/ru/eepm/PlayGUI/ui/logdialog.ui')
 class LogDialog(Adw.Dialog):
     __gtype_name__ = 'LogDialog'
     logdialog_textview = Gtk.Template.Child()
@@ -81,7 +81,7 @@ class LogDialog(Adw.Dialog):
         runner.run_command(command, self)
 
 
-@Gtk.Template(resource_path='/ru/eepm/PlayGUI/window.ui')
+@Gtk.Template(resource_path='/ru/eepm/PlayGUI/ui/window.ui')
 class EepmPlayGuiWindow(Adw.ApplicationWindow):
     __gtype_name__ = 'EepmPlayGuiWindow'
     search_entry = Gtk.Template.Child()