diff --git a/data/res/style.css b/data/res/style.css index 4e55c11..b3ebbf3 100644 --- a/data/res/style.css +++ b/data/res/style.css @@ -14,6 +14,17 @@ padding-bottom: 3px; } +.searchbar .searchtag { + background-color: alpha(currentColor, 0.1); + border-radius: 100px; +} + +.searchbar .searchtag>button { + min-width: 24px; + min-height: 24px; + margin: 0px; +} + .tile { min-height: 50px; min-width: 200px; diff --git a/data/ui/empty_page.blp b/data/ui/empty_page.blp index 1be754d..bee614a 100644 --- a/data/ui/empty_page.blp +++ b/data/ui/empty_page.blp @@ -50,32 +50,23 @@ template $MusicusEmptyPage: Adw.NavigationPage { } menu primary_menu { - section { - item { - label: _("_Import music"); - action: "win.import"; - } - - item { - label: _("_Create album"); - action: "win.create-album"; - } - - item { - label: _("_Library manager"); - action: "win.library"; - } + item { + label: _("_Import music"); + action: "win.import"; } - section { - item { - label: _("_Preferences"); - action: "win.preferences"; - } + item { + label: _("_Library manager"); + action: "win.library"; + } - item { - label: _("_About Musicus"); - action: "app.about"; - } + item { + label: _("_Preferences"); + action: "win.preferences"; + } + + item { + label: _("_About Musicus"); + action: "app.about"; } } diff --git a/data/ui/search_page.blp b/data/ui/search_page.blp index 1cae41a..24daf4d 100644 --- a/data/ui/search_page.blp +++ b/data/ui/search_page.blp @@ -73,14 +73,14 @@ template $MusicusSearchPage: Adw.NavigationPage { ] } } - + Gtk.SearchEntry search_entry { placeholder-text: _("Enter composers, performers, works…"); margin-top: 24; activate => $select() swapped; styles [ - "rounded-entry", + "rounded-entry" ] } @@ -264,33 +264,24 @@ template $MusicusSearchPage: Adw.NavigationPage { } menu primary_menu { - section { - item { - label: _("_Import music"); - action: "win.import"; - } - - item { - label: _("_Create album"); - action: "win.create-album"; - } - - item { - label: _("_Library manager"); - action: "win.library"; - } + item { + label: _("_Import music"); + action: "win.import"; } - section { - item { - label: _("_Preferences"); - action: "win.preferences"; - } + item { + label: _("_Library manager"); + action: "win.library"; + } - item { - label: _("_About Musicus"); - action: "app.about"; - } + item { + label: _("_Preferences"); + action: "win.preferences"; + } + + item { + label: _("_About Musicus"); + action: "app.about"; } } diff --git a/data/ui/search_tag.blp b/data/ui/search_tag.blp new file mode 100644 index 0000000..be66cf5 --- /dev/null +++ b/data/ui/search_tag.blp @@ -0,0 +1,22 @@ +using Gtk 4.0; + +template $MusicusSearchTag : Gtk.Box { + styles ["searchtag"] + + margin-start: 6; + margin-end: 6; + + Gtk.Label label { + styles ["caption-heading"] + margin-start: 12; + margin-end: 6; + max-width-chars: 15; + ellipsize: end; + } + + Gtk.Button button { + styles ["flat", "circular"] + icon-name: "window-close-symbolic"; + clicked => $remove() swapped; + } +} \ No newline at end of file diff --git a/src/album_page.rs b/src/album_page.rs index 2eb51e3..dfab603 100644 --- a/src/album_page.rs +++ b/src/album_page.rs @@ -72,7 +72,8 @@ mod imp { .unwrap() .recordings .iter() - .flat_map(|r| obj.player().recording_to_playlist(r)) + .map(|r| obj.player().recording_to_playlist(r)) + .flatten() .collect::>(); if let Err(err) = obj.player().append(playlist) { @@ -164,7 +165,8 @@ impl AlbumPage { .unwrap() .recordings .iter() - .flat_map(|r| self.player().recording_to_playlist(r)) + .map(|r| self.player().recording_to_playlist(r)) + .flatten() .collect::>(); self.player().append_and_play(playlist); diff --git a/src/album_tile.rs b/src/album_tile.rs index 464b98e..73667cb 100644 --- a/src/album_tile.rs +++ b/src/album_tile.rs @@ -45,7 +45,7 @@ impl AlbumTile { pub fn new(album: &Album) -> Self { let obj: Self = glib::Object::new(); - obj.imp().title_label.set_label(album.name.get()); + obj.imp().title_label.set_label(&album.name.get()); obj.imp().album.set(album.clone()).unwrap(); obj diff --git a/src/editor/program.rs b/src/editor/program.rs index 1ae1cca..708c7b0 100644 --- a/src/editor/program.rs +++ b/src/editor/program.rs @@ -69,7 +69,7 @@ mod imp { self.parent_constructed(); let set_design_action = gio::ActionEntry::builder("set-design") - .parameter_type(Some(glib::VariantTy::STRING)) + .parameter_type(Some(&glib::VariantTy::STRING)) .state(glib::Variant::from("program-1")) .build(); diff --git a/src/editor/recording.rs b/src/editor/recording.rs index a8029e7..4d60e66 100644 --- a/src/editor/recording.rs +++ b/src/editor/recording.rs @@ -246,7 +246,7 @@ impl RecordingEditor { } fn set_work(&self, work: Work) { - self.imp().work_row.set_title(work.name.get()); + self.imp().work_row.set_title(&work.name.get()); self.imp().work_row.set_subtitle( &work .composers_string() diff --git a/src/editor/tracks.rs b/src/editor/tracks.rs index caf356c..4c05e47 100644 --- a/src/editor/tracks.rs +++ b/src/editor/tracks.rs @@ -245,7 +245,8 @@ impl TracksEditor { .track_rows .borrow() .iter() - .flat_map(|t| t.track_data().parts.clone()) + .map(|t| t.track_data().parts.clone()) + .flatten() .collect::>() }; diff --git a/src/editor/work.rs b/src/editor/work.rs index 77f9d17..18191c7 100644 --- a/src/editor/work.rs +++ b/src/editor/work.rs @@ -390,15 +390,17 @@ impl WorkEditor { }; self.emit_by_name::<()>("created", &[&part]); - } else if let Some(work_id) = self.imp().work_id.get() { - library - .update_work(work_id, name, parts, composers, instruments, enable_updates) - .unwrap(); } else { - let work = library - .create_work(name, parts, composers, instruments, enable_updates) - .unwrap(); - self.emit_by_name::<()>("created", &[&work]); + if let Some(work_id) = self.imp().work_id.get() { + library + .update_work(work_id, name, parts, composers, instruments, enable_updates) + .unwrap(); + } else { + let work = library + .create_work(name, parts, composers, instruments, enable_updates) + .unwrap(); + self.emit_by_name::<()>("created", &[&work]); + } } self.imp().navigation.get().unwrap().pop(); diff --git a/src/editor/work/part_row.rs b/src/editor/work/part_row.rs index ca5ae1d..b7d3e42 100644 --- a/src/editor/work/part_row.rs +++ b/src/editor/work/part_row.rs @@ -145,7 +145,7 @@ impl WorkEditorPartRow { } fn set_part(&self, part: Work) { - self.set_title(part.name.get()); + self.set_title(&part.name.get()); if !part.parts.is_empty() { self.set_subtitle( diff --git a/src/empty_page.rs b/src/empty_page.rs index 14acc04..1cf2ffb 100644 --- a/src/empty_page.rs +++ b/src/empty_page.rs @@ -92,8 +92,8 @@ impl EmptyPage { #[template_callback] async fn download_library(&self) { let dialog = adw::AlertDialog::builder() - .heading(gettext("Disclaimer")) - .body(gettext("You are about to download a library of audio files. These are from recordings that are in the public domain under EU law and are hosted on a server within the EU. Please ensure that you comply with the copyright laws of you country.")) + .heading(&gettext("Disclaimer")) + .body(&gettext("You are about to download a library of audio files. These are from recordings that are in the public domain under EU law and are hosted on a server within the EU. Please ensure that you comply with the copyright laws of you country.")) .build(); dialog.add_response("continue", &gettext("Continue")); diff --git a/src/library/edit.rs b/src/library/edit.rs index b7d3134..1e71da9 100644 --- a/src/library/edit.rs +++ b/src/library/edit.rs @@ -209,7 +209,7 @@ impl Library { ) -> Result { let connection = &mut *self.imp().connection.get().unwrap().lock().unwrap(); - let work = Self::create_work_priv( + let work = self.create_work_priv( connection, name, parts, @@ -226,6 +226,7 @@ impl Library { } fn create_work_priv( + &self, connection: &mut SqliteConnection, name: TranslatedString, parts: Vec, @@ -241,7 +242,7 @@ impl Library { let work_data = tables::Work { work_id: work_id.clone(), parent_work_id: parent_work_id.map(|w| w.to_string()), - sequence_number, + sequence_number: sequence_number, name, created_at: now, edited_at: now, @@ -255,7 +256,7 @@ impl Library { .execute(connection)?; for (index, part) in parts.into_iter().enumerate() { - Self::create_work_priv( + self.create_work_priv( connection, part.name, part.parts, @@ -308,7 +309,7 @@ impl Library { ) -> Result<()> { let connection = &mut *self.imp().connection.get().unwrap().lock().unwrap(); - Self::update_work_priv( + self.update_work_priv( connection, work_id, name, @@ -326,6 +327,7 @@ impl Library { } fn update_work_priv( + &self, connection: &mut SqliteConnection, work_id: &str, name: TranslatedString, @@ -365,7 +367,7 @@ impl Library { .optional()? .is_some() { - Self::update_work_priv( + self.update_work_priv( connection, &part.work_id, part.name, @@ -379,7 +381,7 @@ impl Library { } else { // Note: The previously used ID is discarded. This should be OK, because // at this point, the part ID should not have been used anywhere. - Self::create_work_priv( + self.create_work_priv( connection, part.name, part.parts, diff --git a/src/library/exchange.rs b/src/library/exchange.rs index acec25e..5e512ae 100644 --- a/src/library/exchange.rs +++ b/src/library/exchange.rs @@ -29,10 +29,7 @@ impl Library { &self, path: impl AsRef, ) -> Result> { - log::info!( - "Importing library from ZIP at {}", - path.as_ref().to_string_lossy() - ); + log::info!("Importing library from ZIP at {}", path.as_ref().to_string_lossy()); let path = path.as_ref().to_owned(); let library_folder = PathBuf::from(&self.folder()); let this_connection = self.imp().connection.get().unwrap().clone(); @@ -55,10 +52,7 @@ impl Library { &self, path: impl AsRef, ) -> Result> { - log::info!( - "Exporting library to ZIP at {}", - path.as_ref().to_string_lossy() - ); + log::info!("Exporting library to ZIP at {}", path.as_ref().to_string_lossy()); let connection = &mut *self.imp().connection.get().unwrap().lock().unwrap(); let path = path.as_ref().to_owned(); @@ -229,18 +223,22 @@ fn import_metadata_from_url_priv( formatx!(gettext("Downloading {}"), &url).unwrap(), )); - match runtime.block_on(download_tmp_file(&url, sender)) { + match runtime.block_on(download_tmp_file(&url, &sender)) { Ok(db_file) => { let _ = sender.send_blocking(ProcessMsg::Message( formatx!(gettext("Importing downloaded library"), &url).unwrap(), )); let _ = sender.send_blocking(ProcessMsg::Result( - import_metadata_from_file(db_file.path(), this_connection, true).map(|tracks| { - if !tracks.is_empty() { - log::warn!("The metadata file at {url} contains tracks."); - } - }), + import_metadata_from_file(db_file.path(), this_connection, true).and_then( + |tracks| { + if !tracks.is_empty() { + log::warn!("The metadata file at {url} contains tracks."); + } + + Ok(()) + }, + ), )); } Err(err) => { @@ -265,7 +263,7 @@ fn import_library_from_url_priv( formatx!(gettext("Downloading {}"), &url).unwrap(), )); - let archive_file = runtime.block_on(download_tmp_file(&url, sender)); + let archive_file = runtime.block_on(download_tmp_file(&url, &sender)); match archive_file { Ok(archive_file) => { @@ -277,7 +275,7 @@ fn import_library_from_url_priv( archive_file.path(), library_folder, this_connection, - sender, + &sender, ))); } Err(err) => { diff --git a/src/library/query.rs b/src/library/query.rs index 502d354..43b685f 100644 --- a/src/library/query.rs +++ b/src/library/query.rs @@ -414,6 +414,7 @@ impl Library { works, recordings, albums, + ..Default::default() } } LibraryQuery { diff --git a/src/library_manager.rs b/src/library_manager.rs index 5d1d987..5c494f3 100644 --- a/src/library_manager.rs +++ b/src/library_manager.rs @@ -128,13 +128,7 @@ impl LibraryManager { } Ok(path) => { if let Some(path) = path.path() { - match self - .imp() - .library - .get() - .unwrap() - .import_library_from_zip(&path) - { + match self.imp().library.get().unwrap().import_library_from_zip(&path) { Ok(receiver) => { let process = Process::new( &formatx!( @@ -192,13 +186,7 @@ impl LibraryManager { } Ok(path) => { if let Some(path) = path.path() { - match self - .imp() - .library - .get() - .unwrap() - .export_library_to_zip(&path) - { + match self.imp().library.get().unwrap().export_library_to_zip(&path) { Ok(receiver) => { let process = Process::new( &formatx!( diff --git a/src/main.rs b/src/main.rs index 2a9821e..35e5a4c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,6 +20,7 @@ mod program; mod program_tile; mod recording_tile; mod search_page; +mod search_tag; mod selector; mod slider_row; mod tag_tile; @@ -46,7 +47,7 @@ fn main() -> glib::ExitCode { gettextrs::textdomain(config::PKGNAME).unwrap(); gio::resources_register( - &gio::Resource::load(format!( + &gio::Resource::load(&format!( "{}/{}/{}.gresource", config::DATADIR, config::PKGNAME, diff --git a/src/player.rs b/src/player.rs index da1c1bc..8f75d9a 100644 --- a/src/player.rs +++ b/src/player.rs @@ -221,14 +221,14 @@ impl Player { items.push(PlaylistItem::new( true, recording.work.composers_string(), - recording.work.name.get(), + &recording.work.name.get(), Some(&performances), None, - self.library_path_to_file_path(&tracks[0].path), + &self.library_path_to_file_path(&tracks[0].path), &tracks[0].track_id, )); } else { - let mut tracks = tracks.iter(); + let mut tracks = tracks.into_iter(); let first_track = tracks.next().unwrap(); let track_title = |track: &Track, number: usize| -> String { @@ -249,10 +249,10 @@ impl Player { items.push(PlaylistItem::new( true, recording.work.composers_string(), - recording.work.name.get(), + &recording.work.name.get(), Some(&performances), - Some(&track_title(first_track, 1)), - self.library_path_to_file_path(&first_track.path), + Some(&track_title(&first_track, 1)), + &self.library_path_to_file_path(&first_track.path), &first_track.track_id, )); @@ -260,11 +260,11 @@ impl Player { items.push(PlaylistItem::new( false, recording.work.composers_string(), - recording.work.name.get(), + &recording.work.name.get(), Some(&performances), // track number = track index + 1 (first track) + 1 (zero based) - Some(&track_title(track, index + 2)), - self.library_path_to_file_path(&track.path), + Some(&track_title(&track, index + 2)), + &self.library_path_to_file_path(&track.path), &track.track_id, )); } diff --git a/src/program.rs b/src/program.rs index 435cd38..803dbe5 100644 --- a/src/program.rs +++ b/src/program.rs @@ -83,7 +83,7 @@ impl Program { } pub fn from_query(query: LibraryQuery) -> Self { - let settings = gio::Settings::new(config::APP_ID); + let settings = gio::Settings::new(&config::APP_ID); glib::Object::builder() .property( diff --git a/src/program_tile.rs b/src/program_tile.rs index d776864..78f5718 100644 --- a/src/program_tile.rs +++ b/src/program_tile.rs @@ -56,7 +56,7 @@ mod imp { self.set_program_from_settings(&settings); let obj = self.obj().to_owned(); - settings.connect_changed(Some(self.key.get().unwrap()), move |settings, _| { + settings.connect_changed(Some(&self.key.get().unwrap()), move |settings, _| { obj.imp().set_program_from_settings(settings); }); } diff --git a/src/recording_tile.rs b/src/recording_tile.rs index f7afd6c..8ff1373 100644 --- a/src/recording_tile.rs +++ b/src/recording_tile.rs @@ -69,7 +69,7 @@ mod imp { .push(&RecordingEditor::new( obj.imp().navigation.get().unwrap(), obj.imp().library.get().unwrap(), - Some(obj.imp().recording.get().unwrap()), + Some(&obj.imp().recording.get().unwrap()), )); }) .build(); @@ -90,8 +90,8 @@ mod imp { let delete_action = gio::ActionEntry::builder("delete") .activate(move |_, _, _| { let dialog = adw::AlertDialog::builder() - .heading(gettext("Delete recording?")) - .body(gettext("The recording will be removed from your music library and the corresponding audio files will be deleted. This action cannot be undone.")) + .heading(&gettext("Delete recording?")) + .body(&gettext("The recording will be removed from your music library and the corresponding audio files will be deleted. This action cannot be undone.")) .build(); dialog.add_response("delete", &gettext("Delete")); @@ -142,7 +142,7 @@ impl RecordingTile { let obj: Self = glib::Object::new(); let imp = obj.imp(); - imp.work_label.set_label(recording.work.name.get()); + imp.work_label.set_label(&recording.work.name.get()); imp.composer_label.set_label( &recording .work diff --git a/src/search_page.rs b/src/search_page.rs index 21dc00f..b9c6ff7 100644 --- a/src/search_page.rs +++ b/src/search_page.rs @@ -22,7 +22,8 @@ use crate::{ program::Program, program_tile::ProgramTile, recording_tile::RecordingTile, - tag_tile::{Tag, TagTile}, + search_tag::Tag, + tag_tile::TagTile, util, }; @@ -391,7 +392,7 @@ impl SearchPage { imp.header_box.set_visible(!query.is_empty()); let highlight = if let Some(work) = &query.work { - imp.title_label.set_text(work.name.get()); + imp.title_label.set_text(&work.name.get()); if let Some(composers) = work.composers_string() { imp.subtitle_label.set_text(&composers); imp.subtitle_label.set_visible(true); @@ -400,15 +401,15 @@ impl SearchPage { } Some(Tag::Work(work.to_owned())) } else if let Some(person) = &query.composer { - imp.title_label.set_text(person.name.get()); + imp.title_label.set_text(&person.name.get()); imp.subtitle_label.set_visible(false); Some(Tag::Composer(person.to_owned())) } else if let Some(person) = &query.performer { - imp.title_label.set_text(person.name.get()); + imp.title_label.set_text(&person.name.get()); imp.subtitle_label.set_visible(false); Some(Tag::Performer(person.to_owned())) } else if let Some(ensemble) = &query.ensemble { - imp.title_label.set_text(ensemble.name.get()); + imp.title_label.set_text(&ensemble.name.get()); imp.subtitle_label.set_visible(false); Some(Tag::Ensemble(ensemble.to_owned())) } else if let Some(instrument) = &query.instrument { diff --git a/src/search_tag.rs b/src/search_tag.rs new file mode 100644 index 0000000..e2cdb8b --- /dev/null +++ b/src/search_tag.rs @@ -0,0 +1,98 @@ +use std::cell::OnceCell; + +use adw::{glib, glib::subclass::Signal, prelude::*, subclass::prelude::*}; +use once_cell::sync::Lazy; + +use crate::db::models::{Ensemble, Instrument, Person, Work}; + +mod imp { + use super::*; + + #[derive(Debug, Default, gtk::CompositeTemplate)] + #[template(file = "data/ui/search_tag.blp")] + pub struct SearchTag { + #[template_child] + pub label: TemplateChild, + pub tag: OnceCell, + } + + #[glib::object_subclass] + impl ObjectSubclass for SearchTag { + const NAME: &'static str = "MusicusSearchTag"; + type Type = super::SearchTag; + type ParentType = gtk::Box; + + fn class_init(klass: &mut Self::Class) { + klass.bind_template(); + klass.bind_template_instance_callbacks(); + } + + fn instance_init(obj: &glib::subclass::InitializingObject) { + obj.init_template(); + } + } + + impl ObjectImpl for SearchTag { + fn signals() -> &'static [Signal] { + static SIGNALS: Lazy> = + Lazy::new(|| vec![Signal::builder("remove").build()]); + + SIGNALS.as_ref() + } + } + + impl WidgetImpl for SearchTag {} + impl BoxImpl for SearchTag {} +} + +glib::wrapper! { + pub struct SearchTag(ObjectSubclass) + @extends gtk::Widget; +} + +#[gtk::template_callbacks] +impl SearchTag { + pub fn new(tag: Tag) -> Self { + let obj: SearchTag = glib::Object::new(); + + let label = match &tag { + Tag::Composer(person) => person.name.get(), + Tag::Performer(person) => person.name.get(), + Tag::Ensemble(ensemble) => ensemble.name.get(), + Tag::Instrument(instrument) => instrument.name.get(), + Tag::Work(work) => work.name.get(), + }; + + obj.imp().label.set_label(label); + obj.set_tooltip_text(Some(label)); + obj.imp().tag.set(tag).unwrap(); + + obj + } + + pub fn connect_remove(&self, f: F) -> glib::SignalHandlerId { + self.connect_local("remove", true, move |values| { + let obj = values[0].get::().unwrap(); + f(&obj); + None + }) + } + + pub fn tag(&self) -> &Tag { + self.imp().tag.get().unwrap() + } + + #[template_callback] + fn remove(&self) { + self.emit_by_name::<()>("remove", &[]); + } +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum Tag { + Composer(Person), + Performer(Person), + Ensemble(Ensemble), + Instrument(Instrument), + Work(Work), +} diff --git a/src/selector/recording.rs b/src/selector/recording.rs index 1a256d8..eb16c67 100644 --- a/src/selector/recording.rs +++ b/src/selector/recording.rs @@ -294,7 +294,7 @@ impl RecordingSelectorPopover { .build(), ); - row.set_tooltip_text(Some(work.name.get())); + row.set_tooltip_text(Some(&work.name.get())); let work = work.clone(); let obj = self.clone(); diff --git a/src/selector/work.rs b/src/selector/work.rs index c636d3a..46e84f1 100644 --- a/src/selector/work.rs +++ b/src/selector/work.rs @@ -256,7 +256,7 @@ impl WorkSelectorPopover { .build(), ); - row.set_tooltip_text(Some(work.name.get())); + row.set_tooltip_text(Some(&work.name.get())); let work = work.clone(); let obj = self.clone(); diff --git a/src/tag_tile.rs b/src/tag_tile.rs index 7b92ea5..2f2f642 100644 --- a/src/tag_tile.rs +++ b/src/tag_tile.rs @@ -2,7 +2,7 @@ use std::cell::OnceCell; use gtk::{glib, prelude::*, subclass::prelude::*}; -use crate::db::models::{Ensemble, Instrument, Person, Work}; +use crate::search_tag::Tag; mod imp { use super::*; @@ -78,12 +78,3 @@ impl TagTile { self.imp().tag.get().unwrap() } } - -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum Tag { - Composer(Person), - Performer(Person), - Ensemble(Ensemble), - Instrument(Instrument), - Work(Work), -} diff --git a/src/util.rs b/src/util.rs index f1c1322..ecf9f07 100644 --- a/src/util.rs +++ b/src/util.rs @@ -28,7 +28,7 @@ pub fn error_toast(msgid: &str, err: anyhow::Error, toast_overlay: &adw::ToastOv log::error!("{msgid}: {err:?}"); let toast = adw::Toast::builder() - .title(gettext(msgid)) + .title(&gettext(msgid)) .button_label("Details") .build(); diff --git a/src/util/error_dialog.rs b/src/util/error_dialog.rs index 280386d..50d8977 100644 --- a/src/util/error_dialog.rs +++ b/src/util/error_dialog.rs @@ -61,7 +61,7 @@ glib::wrapper! { impl ErrorDialog { pub fn present(err: &anyhow::Error, parent: &impl IsA) { let obj: Self = glib::Object::builder() - .property("error-text", format!("{err:?}")) + .property("error-text", &format!("{err:?}")) .build(); obj.present(Some(parent)); diff --git a/src/window.rs b/src/window.rs index 220e270..b263423 100644 --- a/src/window.rs +++ b/src/window.rs @@ -9,9 +9,8 @@ use gettextrs::gettext; use gtk::{gio, glib, glib::clone}; use crate::{ - album_page::AlbumPage, config, - editor::{album::AlbumEditor, tracks::TracksEditor}, + editor::tracks::TracksEditor, empty_page::EmptyPage, library::{Library, LibraryQuery}, library_manager::LibraryManager, @@ -88,16 +87,6 @@ mod imp { }) .build(); - let obj = self.obj().to_owned(); - let create_album_action = gio::ActionEntry::builder("create-album") - .activate(move |_, _, _| { - if let Some(library) = &*obj.imp().library.borrow() { - let editor = AlbumEditor::new(&obj.imp().navigation_view, library, None); - obj.imp().navigation_view.push(&editor); - } - }) - .build(); - let obj = self.obj().to_owned(); let library_action = gio::ActionEntry::builder("library") .activate(move |_, _, _| { @@ -119,12 +108,8 @@ mod imp { }) .build(); - self.obj().add_action_entries([ - import_action, - create_album_action, - library_action, - preferences_action, - ]); + self.obj() + .add_action_entries([import_action, library_action, preferences_action]); let player_bar = PlayerBar::new(&self.player); self.player_bar_revealer.set_child(Some(&player_bar)); @@ -202,8 +187,8 @@ mod imp { fn close_request(&self) -> glib::signal::Propagation { if self.process_manager.any_ongoing() { let dialog = adw::AlertDialog::builder() - .heading(gettext("Close window?")) - .body(gettext( + .heading(&gettext("Close window?")) + .body(&gettext( "There are ongoing processes that will be canceled.", )) .build(); @@ -377,12 +362,17 @@ impl Window { fn reset_view(&self) { let navigation = self.imp().navigation_view.get(); - // Get all pages that are not instances of SearchPage or AlbumPage. + // Get all pages that are not instances of SearchPage. let mut navigation_stack = navigation .navigation_stack() .iter::() - .filter_map(|page| page.ok()) - .filter(|page| !page.is::() && !page.is::()) + .filter_map(|page| match page { + Ok(page) => match page.downcast_ref::() { + Some(_) => None, + None => Some(page), + }, + Err(_) => None, + }) .collect::>(); navigation_stack.insert(