Use blueprints directly

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 adw = { package = "libadwaita", version = "0.4", features = ["v1_4"]}
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { package = "gtk4", version = "0.6", features = ["v4_10"]}
+gtk = { package = "gtk4", version = "0.6", features = ["v4_10", "blueprint"]}
 log = "0.4"
 once_cell = "1"
 tracing-subscriber = "0.3"

README.md

@@ -4,17 +4,7 @@ The classical music player and organizer.
 
 ## Hacking
 
-## Blueprint files
+### Internationalization
-
-When adding a new Blueprint file in `data/res/`, remember to add it to the
-following file lists:
-
- - list of bluprint sources in `data/res/meson.build`
- - list of resources in `data/res/musicus.gresource.xml` (`.blp` replaced with
-   `.ui`)
- - list of translatable files in `po/POTFILES`
-
-## Internationalization
 
 Execute the following commands from the project root directory to update
 translation files whenever translatable strings have been changed.

data/res/meson.build

@@ -1,21 +1,8 @@
 pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
 gnome = import('gnome')
 
-blueprints = custom_target('blueprints',
-  input: files(
-    'home_page.blp',
-    'playlist_page.blp',
-    'tile.blp',
-    'welcome_page.blp',
-    'window.blp'
-  ),
-  output: '.',
-  command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
-)
-
 gnome.compile_resources('musicus',
   'musicus.gresource.xml',
-  dependencies: blueprints,
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,

data/res/musicus.gresource.xml

@@ -2,11 +2,6 @@
 <gresources>
   <gresource prefix="/de/johrpan/musicus">
     <file preprocess="xml-stripblanks">icons/scalable/actions/playlist-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">home_page.ui</file>
-    <file preprocess="xml-stripblanks">playlist_page.ui</file>
-    <file preprocess="xml-stripblanks">tile.ui</file>
-    <file preprocess="xml-stripblanks">welcome_page.ui</file>
-    <file preprocess="xml-stripblanks">window.ui</file>
     <file compressed="true">style.css</file>
   </gresource>
 </gresources>

src/home_page.rs

@@ -7,7 +7,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(resource = "/de/johrpan/musicus/home_page.ui")]
+    #[template(file = "data/ui/home_page.blp")]
     pub struct MusicusHomePage {
         #[template_child]
         pub search_entry: TemplateChild<gtk::SearchEntry>,

src/playlist_page.rs

@@ -6,7 +6,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(resource = "/de/johrpan/musicus/playlist_page.ui")]
+    #[template(file = "data/ui/playlist_page.blp")]
     pub struct MusicusPlaylistPage {}
 
     #[glib::object_subclass]

src/tile.rs

@@ -4,7 +4,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(resource = "/de/johrpan/musicus/tile.ui")]
+    #[template(file = "data/ui/tile.blp")]
     pub struct MusicusTile {}
 
     #[glib::object_subclass]

src/welcome_page.rs

@@ -7,7 +7,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(resource = "/de/johrpan/musicus/welcome_page.ui")]
+    #[template(file = "data/ui/welcome_page.blp")]
     pub struct MusicusWelcomePage {}
 
     #[glib::object_subclass]

src/window.rs

@@ -10,7 +10,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(resource = "/de/johrpan/musicus/window.ui")]
+    #[template(file = "data/ui/window.blp")]
     pub struct MusicusWindow {
         #[template_child]
         pub stack: TemplateChild<gtk::Stack>,