return ui ub src dir

data/meson.build

@@ -12,13 +12,6 @@ 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',

po/POTFILES

 data/ru.eepm.PlayGUI.desktop.in
 data/ru.eepm.PlayGUI.metainfo.xml.in
 data/ru.eepm.PlayGUI.gschema.xml
-data/ui/help-overlay.ui
-data/ui/window.ui
 src/main.py
+src/help-overlay.ui
 src/window.py
+src/window.ui

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

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

src/meson.build

@@ -13,6 +13,13 @@ configure_file(
   install_mode: 'r-xr-xr-x'
 )
 
+gnome.compile_resources('eepm-play-gui',
+  'eepm-play-gui.gresource.xml',
+  gresource_bundle: true,
+  install: true,
+  install_dir: pkgdatadir,
+)
+
 eepm_play_gui_sources = [
   '__init__.py',
   'main.py',

src/window.py

@@ -65,7 +65,7 @@ class ApplicationRow(Adw.ActionRow):
             print("marked-unchanged")
 
 
-@Gtk.Template(resource_path='/ru/eepm/PlayGUI/ui/logdialog.ui')
+@Gtk.Template(resource_path='/ru/eepm/PlayGUI/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/ui/window.ui')
+@Gtk.Template(resource_path='/ru/eepm/PlayGUI/window.ui')
 class EepmPlayGuiWindow(Adw.ApplicationWindow):
 
     __gtype_name__ = 'EepmPlayGuiWindow'