From e46ab63ef8982a7248d01e6864d11febfc9336bb Mon Sep 17 00:00:00 2001 From: me Date: Thu, 10 Oct 2024 10:18:54 +0000 Subject: [PATCH] removed factory templates --- src/artist_list.blp | 7 ++++++- src/artist_list_artist.blp | 9 --------- src/meson.build | 6 ------ src/play_queue.blp | 7 ++++++- src/play_queue_song.blp | 9 --------- src/song_list_song.blp | 9 --------- src/wavelet.gresource.xml | 3 --- 7 files changed, 12 insertions(+), 38 deletions(-) delete mode 100644 src/artist_list_artist.blp delete mode 100644 src/play_queue_song.blp delete mode 100644 src/song_list_song.blp diff --git a/src/artist_list.blp b/src/artist_list.blp index 64f808b..ff1433d 100644 --- a/src/artist_list.blp +++ b/src/artist_list.blp @@ -21,7 +21,12 @@ template $WaveletArtistList: Adw.NavigationPage { child: ScrolledWindow { ListView list_view { factory: BuilderListItemFactory { - resource: "/eu/callcc/Wavelet/artist_list_artist.ui"; + template ListItem { + child: Label { + halign: start; + label: bind template.item as <$WaveletArtist>.name; + }; + } }; } }; diff --git a/src/artist_list_artist.blp b/src/artist_list_artist.blp deleted file mode 100644 index 2404518..0000000 --- a/src/artist_list_artist.blp +++ /dev/null @@ -1,9 +0,0 @@ -using Gtk 4.0; - -template ListItem { - child: Label { - halign: start; - label: bind template.item as <$WaveletArtist>.name; - }; -} - diff --git a/src/meson.build b/src/meson.build index 7927bab..5e640f6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -21,22 +21,16 @@ wavelet_deps = [ blueprints = custom_target('blueprints', input: files( 'artist_list.blp', - 'artist_list_artist.blp', 'play_queue.blp', - 'play_queue_song.blp', 'setup.blp', 'song_list.blp', - 'song_list_song.blp', 'window.blp', ), output: [ 'artist_list.ui', - 'artist_list_artist.ui', 'play_queue.ui', - 'play_queue_song.ui', 'setup.ui', 'song_list.ui', - 'song_list_song.ui', 'window.ui', ], command: [ diff --git a/src/play_queue.blp b/src/play_queue.blp index 3e3cb83..89c1f0f 100644 --- a/src/play_queue.blp +++ b/src/play_queue.blp @@ -15,7 +15,12 @@ template $WaveletPlayQueue: Adw.NavigationPage { ] factory: BuilderListItemFactory { - resource: "/eu/callcc/Wavelet/play_queue_song.ui"; + template ListItem { + child: Label { + halign: start; + label: bind template.item as <$WaveletSong>.name; + }; + } }; } } diff --git a/src/play_queue_song.blp b/src/play_queue_song.blp deleted file mode 100644 index f8c28ee..0000000 --- a/src/play_queue_song.blp +++ /dev/null @@ -1,9 +0,0 @@ -using Gtk 4.0; - -template ListItem { - child: Label { - halign: start; - label: bind template.item as <$WaveletSong>.name; - }; -} - diff --git a/src/song_list_song.blp b/src/song_list_song.blp deleted file mode 100644 index 3b518d6..0000000 --- a/src/song_list_song.blp +++ /dev/null @@ -1,9 +0,0 @@ -using Gtk 4.0; - -template ListItem { - child: Label { - halign: start; - label: bind template.item as <$WaveletSong>.title; - }; -} - diff --git a/src/wavelet.gresource.xml b/src/wavelet.gresource.xml index 5a6d48f..1318bc3 100644 --- a/src/wavelet.gresource.xml +++ b/src/wavelet.gresource.xml @@ -2,13 +2,10 @@ artist_list.ui - artist_list_artist.ui gtk/help-overlay.ui play_queue.ui - play_queue_song.ui setup.ui song_list.ui - song_list_song.ui window.ui