Move UI files to a subdir

data/window.blp → data/gtk/window.blp

@@ -31,11 +31,11 @@ template RugbyAppWindow : Adw.ApplicationWindow {
       }
     }
 
-    ScrolledWindow {
-      vexpand: true;
+    Adw.Clamp {
+      maximum-size: 600;
 
-      Adw.ClampScrollable {
-        maximum-size: 600;
+      ScrolledWindow {
+        vexpand: true;
 
         ListView listview {
           styles ["rich-list"]
@@ -46,7 +46,7 @@ template RugbyAppWindow : Adw.ApplicationWindow {
             };
           };
           factory: BuilderListItemFactory {
-            resource: "/uk/me/bcowan/Rugby/score-item.ui";
+            resource: "/uk/me/bcowan/Rugby/gtk/score-item.ui";
           };
         }
       }

data/meson.build

@@ -5,8 +5,8 @@
 blueprints = custom_target('blueprints',
   input: files(
     'gtk/help-overlay.blp',
-    'prefs.blp',
-    'window.blp'
+    'gtk/prefs.blp',
+    'gtk/window.blp'
   ),
   output: '.',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],

data/rugby.gresource.xml

@@ -7,8 +7,8 @@
 <gresources>
   <gresource prefix="/uk/me/bcowan/Rugby">
     <file preprocess="xml-stripblanks" compressed="true">gtk/help-overlay.ui</file>
-    <file preprocess="xml-stripblanks" compressed="true">prefs.ui</file>
-    <file preprocess="xml-stripblanks" compressed="true">score-item.ui</file>
-    <file preprocess="xml-stripblanks" compressed="true">window.ui</file>
+    <file preprocess="xml-stripblanks" compressed="true">gtk/prefs.ui</file>
+    <file preprocess="xml-stripblanks" compressed="true">gtk/score-item.ui</file>
+    <file preprocess="xml-stripblanks" compressed="true">gtk/window.ui</file>
   </gresource>
 </gresources>

src/rugby-app-window.c

@@ -136,7 +136,7 @@ rugby_app_window_class_init (RugbyAppWindowClass *klass)
     object_class->dispose = rugby_app_window_dispose;
 
     gtk_widget_class_set_template_from_resource (widget_class,
-                                                 "/uk/me/bcowan/Rugby/window.ui");
+                                                 "/uk/me/bcowan/Rugby/gtk/window.ui");
 
     gtk_widget_class_bind_template_child (widget_class, RugbyAppWindow, scorespin);
     gtk_widget_class_bind_template_child (widget_class, RugbyAppWindow, menu_button);

src/rugby-pref-window.c

@@ -39,7 +39,7 @@ rugby_pref_window_class_init (RugbyPrefWindowClass *klass)
   object_class->dispose = rugby_pref_window_dispose;
 
   gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/uk/me/bcowan/Rugby/prefs.ui");
+                                               "/uk/me/bcowan/Rugby/gtk/prefs.ui");
 
   gtk_widget_class_bind_template_child (widget_class, RugbyPrefWindow, try_spin);
   gtk_widget_class_bind_template_child (widget_class, RugbyPrefWindow, utry_spin);