From 6378556546485f5a7690de67215ee8286b4e1222 Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Fri, 29 Jan 2021 15:17:27 +0100 Subject: [PATCH] Switch from libhandy to libadwaita --- Cargo.toml | 6 +++--- de.johrpan.musicus.json | 6 +++--- meson.build | 2 +- res/ui/ensemble_editor.ui | 12 ++++++------ res/ui/ensemble_screen.ui | 8 ++++---- res/ui/instrument_editor.ui | 12 ++++++------ res/ui/login_dialog.ui | 12 ++++++------ res/ui/medium_editor.ui | 10 +++++----- res/ui/performance_editor.ui | 12 ++++++------ res/ui/person_editor.ui | 14 +++++++------- res/ui/person_screen.ui | 8 ++++---- res/ui/player_screen.ui | 6 +++--- res/ui/poe_list.ui | 4 ++-- res/ui/preferences.ui | 16 ++++++++-------- res/ui/recording_editor.ui | 14 +++++++------- res/ui/recording_screen.ui | 6 +++--- res/ui/selector.ui | 8 ++++---- res/ui/server_dialog.ui | 8 ++++---- res/ui/source_selector.ui | 6 +++--- res/ui/track_editor.ui | 6 +++--- res/ui/track_selector.ui | 6 +++--- res/ui/track_set_editor.ui | 8 ++++---- res/ui/window.ui | 18 +++++++++--------- res/ui/work_editor.ui | 14 +++++++------- res/ui/work_part_editor.ui | 10 +++++----- res/ui/work_screen.ui | 8 ++++---- res/ui/work_section_editor.ui | 8 ++++---- src/dialogs/login_dialog.rs | 4 ++-- src/dialogs/preferences.rs | 18 +++++++++--------- src/dialogs/server_dialog.rs | 4 ++-- src/editors/performance.rs | 14 +++++++------- src/editors/recording.rs | 8 ++++---- src/editors/work.rs | 10 +++++----- src/editors/work_part.rs | 6 +++--- src/import/medium_editor.rs | 4 ++-- src/import/track_editor.rs | 4 ++-- src/import/track_selector.rs | 4 ++-- src/import/track_set_editor.rs | 8 ++++---- src/main.rs | 2 +- src/screens/ensemble_screen.rs | 4 ++-- src/screens/person_screen.rs | 6 +++--- src/screens/player_screen.rs | 6 +++--- src/screens/recording_screen.rs | 4 ++-- src/screens/work_screen.rs | 4 ++-- src/selectors/ensemble.rs | 4 ++-- src/selectors/instrument.rs | 4 ++-- src/selectors/person.rs | 4 ++-- src/selectors/recording.rs | 4 ++-- src/selectors/work.rs | 4 ++-- src/widgets/navigator_window.rs | 6 +++--- src/widgets/poe_list.rs | 4 ++-- src/window.rs | 8 ++++---- 52 files changed, 198 insertions(+), 198 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 342172c..b2ec831 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,9 +40,9 @@ features = ["v2_64"] git = "https://github.com/gtk-rs/gtk4-rs" package = "gtk4" -[dependencies.libhandy] -git = "https://gitlab.gnome.org/bilelmoussaoui/libhandy4-rs" -package = "libhandy4" +[dependencies.libadwaita] +git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs" +package = "libadwaita" [dependencies.pango] git = "https://github.com/gtk-rs/gtk-rs/" diff --git a/de.johrpan.musicus.json b/de.johrpan.musicus.json index 573f915..a6da167 100644 --- a/de.johrpan.musicus.json +++ b/de.johrpan.musicus.json @@ -93,7 +93,7 @@ ] }, { - "name" : "libhandy", + "name" : "libadwaita", "buildsystem" : "meson", "config-opts" : [ "-Dintrospection=enabled", @@ -109,8 +109,8 @@ "sources" : [ { "type" : "git", - "url" : "https://gitlab.gnome.org/exalm/libhandy", - "branch" : "gtk4" + "url" : "https://gitlab.gnome.org/exalm/libadwaita.git", + "branch" : "main" } ] }, diff --git a/meson.build b/meson.build index 8c1eb65..9f5f0a1 100644 --- a/meson.build +++ b/meson.build @@ -11,7 +11,7 @@ dependency('gstreamer-1.0', version: '>= 1.12') dependency('gtk+-3.0', version: '>= 3.24.7') dependency('libcurl', version: '>= 7.24.0') dependency('libdiscid', version: '>= 0.6.2') -dependency('libhandy-1', version: '>= 1.0.0') +dependency('libadwaita-1', version: '>= 1.0') dependency('pango', version: '>= 1.0') dependency('sqlite3', version: '>= 3.20') diff --git a/res/ui/ensemble_editor.ui b/res/ui/ensemble_editor.ui index b4342c9..60d0ce7 100644 --- a/res/ui/ensemble_editor.ui +++ b/res/ui/ensemble_editor.ui @@ -1,7 +1,7 @@ - + crossfade @@ -11,7 +11,7 @@ vertical - + false false @@ -46,7 +46,7 @@ true - + 12 12 18 @@ -60,7 +60,7 @@ none - + True Name name_entry @@ -73,7 +73,7 @@ - + True Publish to the server upload_switch @@ -104,7 +104,7 @@ vertical - + false false diff --git a/res/ui/ensemble_screen.ui b/res/ui/ensemble_screen.ui index a6aa910..02cde11 100644 --- a/res/ui/ensemble_screen.ui +++ b/res/ui/ensemble_screen.ui @@ -1,11 +1,11 @@ - + vertical - + Ensemble @@ -36,7 +36,7 @@ False - + 400 true @@ -67,7 +67,7 @@ true - + 12 12 18 diff --git a/res/ui/instrument_editor.ui b/res/ui/instrument_editor.ui index f667d69..ed33cce 100644 --- a/res/ui/instrument_editor.ui +++ b/res/ui/instrument_editor.ui @@ -1,7 +1,7 @@ - + crossfade @@ -11,7 +11,7 @@ vertical - + false false @@ -46,7 +46,7 @@ true - + 12 12 18 @@ -60,7 +60,7 @@ none - + True Name name_entry @@ -73,7 +73,7 @@ - + True Publish to the server upload_switch @@ -104,7 +104,7 @@ vertical - + false false diff --git a/res/ui/login_dialog.ui b/res/ui/login_dialog.ui index 78e035a..a870540 100644 --- a/res/ui/login_dialog.ui +++ b/res/ui/login_dialog.ui @@ -1,8 +1,8 @@ - - + + True 350 @@ -15,7 +15,7 @@ vertical - + false false @@ -57,7 +57,7 @@ none - + True Username username_entry @@ -70,7 +70,7 @@ - + True Password password_entry @@ -98,7 +98,7 @@ vertical - + false false diff --git a/res/ui/medium_editor.ui b/res/ui/medium_editor.ui index 1561bf7..a07b16c 100644 --- a/res/ui/medium_editor.ui +++ b/res/ui/medium_editor.ui @@ -1,7 +1,7 @@ - + crossfade @@ -11,7 +11,7 @@ vertical - + false false @@ -61,7 +61,7 @@ True - + 6 @@ -85,7 +85,7 @@ none - + True Name of the medium name_entry @@ -98,7 +98,7 @@ - + True Publish to the server publish_switch diff --git a/res/ui/performance_editor.ui b/res/ui/performance_editor.ui index e68c62b..56f9062 100644 --- a/res/ui/performance_editor.ui +++ b/res/ui/performance_editor.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -36,7 +36,7 @@ true - + 12 12 18 @@ -50,7 +50,7 @@ none - + True Select a person person_button @@ -63,7 +63,7 @@ - + True Select an ensemble ensemble_button @@ -76,7 +76,7 @@ - + True Select a role role_button diff --git a/res/ui/person_editor.ui b/res/ui/person_editor.ui index fdd3fed..78d3e45 100644 --- a/res/ui/person_editor.ui +++ b/res/ui/person_editor.ui @@ -1,7 +1,7 @@ - + crossfade @@ -11,7 +11,7 @@ vertical - + false false @@ -46,7 +46,7 @@ true - + 12 12 18 @@ -60,7 +60,7 @@ none - + True First name first_name_entry @@ -73,7 +73,7 @@ - + True Last name last_name_entry @@ -86,7 +86,7 @@ - + True Publish to the server upload_switch @@ -117,7 +117,7 @@ vertical - + false false diff --git a/res/ui/person_screen.ui b/res/ui/person_screen.ui index 5149dae..4a1aeda 100644 --- a/res/ui/person_screen.ui +++ b/res/ui/person_screen.ui @@ -1,11 +1,11 @@ - + vertical - + Person @@ -36,7 +36,7 @@ False - + 400 true @@ -71,7 +71,7 @@ true - + 12 12 18 diff --git a/res/ui/player_screen.ui b/res/ui/player_screen.ui index 2c6b97e..981deb5 100644 --- a/res/ui/player_screen.ui +++ b/res/ui/player_screen.ui @@ -1,7 +1,7 @@ - + media-playback-start-symbolic @@ -13,7 +13,7 @@ vertical - + Player @@ -37,7 +37,7 @@ true - + 12 12 18 diff --git a/res/ui/poe_list.ui b/res/ui/poe_list.ui index 3200fa3..b8c585b 100644 --- a/res/ui/poe_list.ui +++ b/res/ui/poe_list.ui @@ -1,14 +1,14 @@ - + vertical True - + 400 300 true diff --git a/res/ui/preferences.ui b/res/ui/preferences.ui index 1f1fce5..e4bbf6d 100644 --- a/res/ui/preferences.ui +++ b/res/ui/preferences.ui @@ -1,19 +1,19 @@ - - + + True 400 400 - + General - + Music library - + Music library folder select_music_library_path_button None selected @@ -29,10 +29,10 @@ - + Server connection - + Server URL url_button Not set @@ -46,7 +46,7 @@ - + Login credentials login_button Not logged in diff --git a/res/ui/recording_editor.ui b/res/ui/recording_editor.ui index fe4cc40..3748fd6 100644 --- a/res/ui/recording_editor.ui +++ b/res/ui/recording_editor.ui @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ vertical - + false false @@ -46,7 +46,7 @@ true - + 12 12 18 @@ -74,7 +74,7 @@ none - + True Select a work work_button @@ -87,7 +87,7 @@ - + True Comment comment_entry @@ -100,7 +100,7 @@ - + True Publish to the server upload_switch @@ -160,7 +160,7 @@ vertical - + false false diff --git a/res/ui/recording_screen.ui b/res/ui/recording_screen.ui index 59de962..6a0a640 100644 --- a/res/ui/recording_screen.ui +++ b/res/ui/recording_screen.ui @@ -1,11 +1,11 @@ - + vertical - + vertical @@ -59,7 +59,7 @@ true - + 12 12 18 diff --git a/res/ui/selector.ui b/res/ui/selector.ui index 79c27d4..bc3fd41 100644 --- a/res/ui/selector.ui +++ b/res/ui/selector.ui @@ -1,13 +1,13 @@ - + 250 False vertical - + false false @@ -47,7 +47,7 @@ True - + 500 300 true @@ -100,7 +100,7 @@ 200 true - + 500 300 diff --git a/res/ui/server_dialog.ui b/res/ui/server_dialog.ui index 12b02a1..6e481fd 100644 --- a/res/ui/server_dialog.ui +++ b/res/ui/server_dialog.ui @@ -1,14 +1,14 @@ - - + + True vertical - + false false @@ -39,7 +39,7 @@ none - + True URL url_entry diff --git a/res/ui/source_selector.ui b/res/ui/source_selector.ui index 084af8d..3b7b711 100644 --- a/res/ui/source_selector.ui +++ b/res/ui/source_selector.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -49,7 +49,7 @@ - + true folder-music-symbolic Import music diff --git a/res/ui/track_editor.ui b/res/ui/track_editor.ui index c7c6796..9f138bb 100644 --- a/res/ui/track_editor.ui +++ b/res/ui/track_editor.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -35,7 +35,7 @@ True - + start diff --git a/res/ui/track_selector.ui b/res/ui/track_selector.ui index 0f658ad..e8d14e9 100644 --- a/res/ui/track_selector.ui +++ b/res/ui/track_selector.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -36,7 +36,7 @@ True - + start diff --git a/res/ui/track_set_editor.ui b/res/ui/track_set_editor.ui index ac03ee6..c0fc576 100644 --- a/res/ui/track_set_editor.ui +++ b/res/ui/track_set_editor.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -36,7 +36,7 @@ True - + 6 @@ -60,7 +60,7 @@ none - + True Select a recording select_recording_button diff --git a/res/ui/window.ui b/res/ui/window.ui index fb436aa..f8fe29c 100644 --- a/res/ui/window.ui +++ b/res/ui/window.ui @@ -1,11 +1,11 @@ - + vertical - + @@ -47,7 +47,7 @@ - + 800 566 @@ -60,7 +60,7 @@ vertical - + Musicus @@ -130,7 +130,7 @@ vertical - + @@ -153,17 +153,17 @@ vertical - + true - + 250 False vertical - + false false @@ -198,7 +198,7 @@ - + False diff --git a/res/ui/work_editor.ui b/res/ui/work_editor.ui index cf2380d..f548a9b 100644 --- a/res/ui/work_editor.ui +++ b/res/ui/work_editor.ui @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ False vertical - + false false @@ -48,7 +48,7 @@ true - + 12 12 18 @@ -76,7 +76,7 @@ none - + True Select a composer composer_button @@ -89,7 +89,7 @@ - + True Title title_entry @@ -102,7 +102,7 @@ - + True Publish to the server upload_switch @@ -195,7 +195,7 @@ vertical - + false false diff --git a/res/ui/work_part_editor.ui b/res/ui/work_part_editor.ui index 20ca2c3..dc4e434 100644 --- a/res/ui/work_part_editor.ui +++ b/res/ui/work_part_editor.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -40,7 +40,7 @@ true - + 12 12 18 @@ -54,7 +54,7 @@ none - + True Title title_entry @@ -67,7 +67,7 @@ - + True Select a composer composer_button diff --git a/res/ui/work_screen.ui b/res/ui/work_screen.ui index 2c5e5fe..44f4ca0 100644 --- a/res/ui/work_screen.ui +++ b/res/ui/work_screen.ui @@ -1,11 +1,11 @@ - + vertical - + vertical @@ -49,7 +49,7 @@ False - + 400 true @@ -80,7 +80,7 @@ true - + 12 12 18 diff --git a/res/ui/work_section_editor.ui b/res/ui/work_section_editor.ui index 423e3d5..46862dd 100644 --- a/res/ui/work_section_editor.ui +++ b/res/ui/work_section_editor.ui @@ -1,11 +1,11 @@ - + vertical - + false false @@ -40,7 +40,7 @@ true - + 12 12 18 @@ -54,7 +54,7 @@ none - + True Title title_entry diff --git a/src/dialogs/login_dialog.rs b/src/dialogs/login_dialog.rs index 682c733..b1946be 100644 --- a/src/dialogs/login_dialog.rs +++ b/src/dialogs/login_dialog.rs @@ -8,7 +8,7 @@ use std::rc::Rc; /// A dialog for entering login credentials. pub struct LoginDialog { backend: Rc, - window: libhandy::Window, + window: libadwaita::Window, stack: gtk::Stack, info_bar: gtk::InfoBar, username_entry: gtk::Entry, @@ -22,7 +22,7 @@ impl LoginDialog { // Create UI let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/login_dialog.ui"); - get_widget!(builder, libhandy::Window, window); + get_widget!(builder, libadwaita::Window, window); get_widget!(builder, gtk::Stack, stack); get_widget!(builder, gtk::InfoBar, info_bar); get_widget!(builder, gtk::Button, cancel_button); diff --git a/src/dialogs/preferences.rs b/src/dialogs/preferences.rs index 9ac4153..3e7683d 100644 --- a/src/dialogs/preferences.rs +++ b/src/dialogs/preferences.rs @@ -4,16 +4,16 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::rc::Rc; /// A dialog for configuring the app. pub struct Preferences { backend: Rc, - window: libhandy::Window, - music_library_path_row: libhandy::ActionRow, - url_row: libhandy::ActionRow, - login_row: libhandy::ActionRow, + window: libadwaita::Window, + music_library_path_row: libadwaita::ActionRow, + url_row: libadwaita::ActionRow, + login_row: libadwaita::ActionRow, } impl Preferences { @@ -22,12 +22,12 @@ impl Preferences { // Create UI let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/preferences.ui"); - get_widget!(builder, libhandy::Window, window); - get_widget!(builder, libhandy::ActionRow, music_library_path_row); + get_widget!(builder, libadwaita::Window, window); + get_widget!(builder, libadwaita::ActionRow, music_library_path_row); get_widget!(builder, gtk::Button, select_music_library_path_button); - get_widget!(builder, libhandy::ActionRow, url_row); + get_widget!(builder, libadwaita::ActionRow, url_row); get_widget!(builder, gtk::Button, url_button); - get_widget!(builder, libhandy::ActionRow, login_row); + get_widget!(builder, libadwaita::ActionRow, login_row); get_widget!(builder, gtk::Button, login_button); window.set_transient_for(Some(parent)); diff --git a/src/dialogs/server_dialog.rs b/src/dialogs/server_dialog.rs index 90d9d39..cb024ae 100644 --- a/src/dialogs/server_dialog.rs +++ b/src/dialogs/server_dialog.rs @@ -8,7 +8,7 @@ use std::rc::Rc; /// A dialog for setting up the server. pub struct ServerDialog { backend: Rc, - window: libhandy::Window, + window: libadwaita::Window, url_entry: gtk::Entry, selected_cb: RefCell ()>>>, } @@ -19,7 +19,7 @@ impl ServerDialog { // Create UI let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/server_dialog.ui"); - get_widget!(builder, libhandy::Window, window); + get_widget!(builder, libadwaita::Window, window); get_widget!(builder, gtk::Button, cancel_button); get_widget!(builder, gtk::Button, set_button); get_widget!(builder, gtk::Entry, url_entry); diff --git a/src/editors/performance.rs b/src/editors/performance.rs index e9cc0e0..b54e9d0 100644 --- a/src/editors/performance.rs +++ b/src/editors/performance.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -15,9 +15,9 @@ pub struct PerformanceEditor { backend: Rc, widget: gtk::Box, save_button: gtk::Button, - person_row: libhandy::ActionRow, - ensemble_row: libhandy::ActionRow, - role_row: libhandy::ActionRow, + person_row: libadwaita::ActionRow, + ensemble_row: libadwaita::ActionRow, + role_row: libadwaita::ActionRow, reset_role_button: gtk::Button, person: RefCell>, ensemble: RefCell>, @@ -40,9 +40,9 @@ impl PerformanceEditor { get_widget!(builder, gtk::Button, ensemble_button); get_widget!(builder, gtk::Button, role_button); get_widget!(builder, gtk::Button, reset_role_button); - get_widget!(builder, libhandy::ActionRow, person_row); - get_widget!(builder, libhandy::ActionRow, ensemble_row); - get_widget!(builder, libhandy::ActionRow, role_row); + get_widget!(builder, libadwaita::ActionRow, person_row); + get_widget!(builder, libadwaita::ActionRow, ensemble_row); + get_widget!(builder, libadwaita::ActionRow, role_row); let this = Rc::new(PerformanceEditor { backend, diff --git a/src/editors/recording.rs b/src/editors/recording.rs index 706e780..d3a7677 100644 --- a/src/editors/recording.rs +++ b/src/editors/recording.rs @@ -8,7 +8,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -18,7 +18,7 @@ pub struct RecordingEditor { backend: Rc, save_button: gtk::Button, info_bar: gtk::InfoBar, - work_row: libhandy::ActionRow, + work_row: libadwaita::ActionRow, comment_entry: gtk::Entry, upload_switch: gtk::Switch, performance_list: Rc, @@ -40,7 +40,7 @@ impl RecordingEditor { get_widget!(builder, gtk::Button, back_button); get_widget!(builder, gtk::Button, save_button); get_widget!(builder, gtk::InfoBar, info_bar); - get_widget!(builder, libhandy::ActionRow, work_row); + get_widget!(builder, libadwaita::ActionRow, work_row); get_widget!(builder, gtk::Button, work_button); get_widget!(builder, gtk::Entry, comment_entry); get_widget!(builder, gtk::Switch, upload_switch); @@ -173,7 +173,7 @@ impl RecordingEditor { } })); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&performance.get_title())); row.add_suffix(&delete_button); diff --git a/src/editors/work.rs b/src/editors/work.rs index c275887..1f3ebd2 100644 --- a/src/editors/work.rs +++ b/src/editors/work.rs @@ -9,7 +9,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::convert::TryInto; use std::rc::Rc; @@ -37,7 +37,7 @@ pub struct WorkEditor { save_button: gtk::Button, title_entry: gtk::Entry, info_bar: gtk::InfoBar, - composer_row: libhandy::ActionRow, + composer_row: libadwaita::ActionRow, upload_switch: gtk::Switch, instrument_list: Rc, part_list: Rc, @@ -62,7 +62,7 @@ impl WorkEditor { get_widget!(builder, gtk::InfoBar, info_bar); get_widget!(builder, gtk::Entry, title_entry); get_widget!(builder, gtk::Button, composer_button); - get_widget!(builder, libhandy::ActionRow, composer_row); + get_widget!(builder, libadwaita::ActionRow, composer_row); get_widget!(builder, gtk::Switch, upload_switch); get_widget!(builder, gtk::Frame, instrument_frame); get_widget!(builder, gtk::Button, add_instrument_button); @@ -179,7 +179,7 @@ impl WorkEditor { this.instrument_list.update(length); })); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_title(Some(&instrument.name)); row.add_suffix(&delete_button); @@ -265,7 +265,7 @@ impl WorkEditor { } })); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&pos.get_title())); row.add_suffix(&delete_button); diff --git a/src/editors/work_part.rs b/src/editors/work_part.rs index 9f48e34..86255ab 100644 --- a/src/editors/work_part.rs +++ b/src/editors/work_part.rs @@ -6,7 +6,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -15,7 +15,7 @@ pub struct WorkPartEditor { backend: Rc, widget: gtk::Box, title_entry: gtk::Entry, - composer_row: libhandy::ActionRow, + composer_row: libadwaita::ActionRow, reset_composer_button: gtk::Button, composer: RefCell>, ready_cb: RefCell ()>>>, @@ -34,7 +34,7 @@ impl WorkPartEditor { get_widget!(builder, gtk::Button, save_button); get_widget!(builder, gtk::Entry, title_entry); get_widget!(builder, gtk::Button, composer_button); - get_widget!(builder, libhandy::ActionRow, composer_row); + get_widget!(builder, libadwaita::ActionRow, composer_row); get_widget!(builder, gtk::Button, reset_composer_button); let composer = match part { diff --git a/src/import/medium_editor.rs b/src/import/medium_editor.rs index b223579..6509a41 100644 --- a/src/import/medium_editor.rs +++ b/src/import/medium_editor.rs @@ -8,7 +8,7 @@ use glib::clone; use glib::prelude::*; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -117,7 +117,7 @@ impl MediumEditor { edit_button.set_valign(gtk::Align::Center); edit_button.set_child(Some(&edit_image)); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&title)); row.set_subtitle(Some(&subtitle)); diff --git a/src/import/track_editor.rs b/src/import/track_editor.rs index be967ea..177b791 100644 --- a/src/import/track_editor.rs +++ b/src/import/track_editor.rs @@ -3,7 +3,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -76,7 +76,7 @@ impl TrackEditor { } })); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.add_prefix(&check); row.set_activatable_widget(Some(&check)); row.set_title(Some(&part.title)); diff --git a/src/import/track_selector.rs b/src/import/track_selector.rs index 6972a2b..4059fc9 100644 --- a/src/import/track_selector.rs +++ b/src/import/track_selector.rs @@ -3,7 +3,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -89,7 +89,7 @@ impl TrackSelector { let title = format!("Track {}", track.number); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.add_prefix(&check); row.set_activatable_widget(Some(&check)); row.set_activatable(true); diff --git a/src/import/track_set_editor.rs b/src/import/track_set_editor.rs index 776abde..7381a1f 100644 --- a/src/import/track_set_editor.rs +++ b/src/import/track_set_editor.rs @@ -9,7 +9,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -36,7 +36,7 @@ pub struct TrackSetEditor { source: Rc>, widget: gtk::Box, save_button: gtk::Button, - recording_row: libhandy::ActionRow, + recording_row: libadwaita::ActionRow, track_list: Rc, recording: RefCell>, tracks: RefCell>, @@ -54,7 +54,7 @@ impl TrackSetEditor { get_widget!(builder, gtk::Box, widget); get_widget!(builder, gtk::Button, back_button); get_widget!(builder, gtk::Button, save_button); - get_widget!(builder, libhandy::ActionRow, recording_row); + get_widget!(builder, libadwaita::ActionRow, recording_row); get_widget!(builder, gtk::Button, select_recording_button); get_widget!(builder, gtk::Button, edit_tracks_button); get_widget!(builder, gtk::Frame, tracks_frame); @@ -185,7 +185,7 @@ impl TrackSetEditor { edit_button.set_valign(gtk::Align::Center); edit_button.set_child(Some(&edit_image)); - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&title)); row.set_subtitle(Some(&subtitle)); diff --git a/src/main.rs b/src/main.rs index 49be0f5..4d1d79d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,7 +34,7 @@ fn main() { gstreamer::init().expect("Failed to initialize GStreamer!"); gtk::init().expect("Failed to initialize GTK!"); - libhandy::init(); + libadwaita::init(); resources::init().expect("Failed to initialize resources!"); let app = gtk::Application::new(Some("de.johrpan.musicus"), gio::ApplicationFlags::empty()) diff --git a/src/screens/ensemble_screen.rs b/src/screens/ensemble_screen.rs index 16101c7..f63aea1 100644 --- a/src/screens/ensemble_screen.rs +++ b/src/screens/ensemble_screen.rs @@ -7,7 +7,7 @@ use gio::prelude::*; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -72,7 +72,7 @@ impl EnsembleScreen { this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| { let recording = &this.recordings.borrow()[index]; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&recording.work.get_title())); row.set_subtitle(Some(&recording.get_performers())); diff --git a/src/screens/person_screen.rs b/src/screens/person_screen.rs index 3955461..9937acc 100644 --- a/src/screens/person_screen.rs +++ b/src/screens/person_screen.rs @@ -7,7 +7,7 @@ use gio::prelude::*; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -86,7 +86,7 @@ impl PersonScreen { this.work_list.set_make_widget_cb(clone!(@strong this => move |index| { let work = &this.works.borrow()[index]; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&work.title)); @@ -111,7 +111,7 @@ impl PersonScreen { this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| { let recording = &this.recordings.borrow()[index]; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&recording.work.get_title())); row.set_subtitle(Some(&recording.get_performers())); diff --git a/src/screens/player_screen.rs b/src/screens/player_screen.rs index c015d4e..cfe415d 100644 --- a/src/screens/player_screen.rs +++ b/src/screens/player_screen.rs @@ -4,7 +4,7 @@ use gettextrs::gettext; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::{Cell, RefCell}; use std::rc::Rc; @@ -155,7 +155,7 @@ impl PlayerScreen { let playlist_item = &this.playlist.borrow()[item_index]; let recording = &playlist_item.track_set.recording; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(false); row.set_selectable(false); row.set_title(Some(&recording.work.get_title())); @@ -179,7 +179,7 @@ impl PlayerScreen { parts.join(", ") }; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_selectable(false); row.set_activatable(true); row.set_title(Some(&title)); diff --git a/src/screens/recording_screen.rs b/src/screens/recording_screen.rs index d97aa69..85b9303 100644 --- a/src/screens/recording_screen.rs +++ b/src/screens/recording_screen.rs @@ -8,7 +8,7 @@ use gio::prelude::*; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -92,7 +92,7 @@ impl RecordingScreen { title_parts.join(", ") }; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_title(Some(&title)); row.upcast() diff --git a/src/screens/work_screen.rs b/src/screens/work_screen.rs index 9979e5a..2f8ce60 100644 --- a/src/screens/work_screen.rs +++ b/src/screens/work_screen.rs @@ -7,7 +7,7 @@ use gio::prelude::*; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -74,7 +74,7 @@ impl WorkScreen { this.recording_list.set_make_widget_cb(clone!(@strong this => move |index| { let recording = &this.recordings.borrow()[index]; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&recording.work.get_title())); row.set_subtitle(Some(&recording.get_performers())); diff --git a/src/selectors/ensemble.rs b/src/selectors/ensemble.rs index 76ecf6e..b3ec260 100644 --- a/src/selectors/ensemble.rs +++ b/src/selectors/ensemble.rs @@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -65,7 +65,7 @@ impl EnsembleSelector { })); this.selector.set_make_widget(clone!(@strong this => move |ensemble| { - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&ensemble.name)); diff --git a/src/selectors/instrument.rs b/src/selectors/instrument.rs index 2bf835e..f4b41a5 100644 --- a/src/selectors/instrument.rs +++ b/src/selectors/instrument.rs @@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -65,7 +65,7 @@ impl InstrumentSelector { })); this.selector.set_make_widget(clone!(@strong this => move |instrument| { - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&instrument.name)); diff --git a/src/selectors/person.rs b/src/selectors/person.rs index f991758..456a679 100644 --- a/src/selectors/person.rs +++ b/src/selectors/person.rs @@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -65,7 +65,7 @@ impl PersonSelector { })); this.selector.set_make_widget(clone!(@strong this => move |person| { - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&person.name_lf())); diff --git a/src/selectors/recording.rs b/src/selectors/recording.rs index 7d66f20..8b8e400 100644 --- a/src/selectors/recording.rs +++ b/src/selectors/recording.rs @@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -75,7 +75,7 @@ impl RecordingSelector { })); this.selector.set_make_widget(clone!(@strong this => move |recording| { - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&recording.get_performers())); diff --git a/src/selectors/work.rs b/src/selectors/work.rs index d937770..b163134 100644 --- a/src/selectors/work.rs +++ b/src/selectors/work.rs @@ -6,7 +6,7 @@ use crate::widgets::{Navigator, NavigatorScreen}; use gettextrs::gettext; use glib::clone; use gtk::prelude::*; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -75,7 +75,7 @@ impl WorkSelector { })); this.selector.set_make_widget(clone!(@strong this => move |work| { - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&work.title)); diff --git a/src/widgets/navigator_window.rs b/src/widgets/navigator_window.rs index 297383b..70eb938 100644 --- a/src/widgets/navigator_window.rs +++ b/src/widgets/navigator_window.rs @@ -5,7 +5,7 @@ use std::rc::Rc; /// A window hosting a navigator. pub struct NavigatorWindow { - window: libhandy::Window, + window: libadwaita::Window, navigator: Rc, } @@ -14,11 +14,11 @@ impl NavigatorWindow { pub fn new(initial_screen: Rc) -> Rc { // Create UI - let window = libhandy::Window::new(); + let window = libadwaita::Window::new(); window.set_default_size(600, 424); let placeholder = gtk::Label::new(None); let navigator = Navigator::new(&window, &placeholder); - libhandy::WindowExt::set_child(&window, Some(&navigator.widget)); + libadwaita::WindowExt::set_child(&window, Some(&navigator.widget)); let this = Rc::new(Self { window, navigator }); diff --git a/src/widgets/poe_list.rs b/src/widgets/poe_list.rs index 3077726..d1fe7c6 100644 --- a/src/widgets/poe_list.rs +++ b/src/widgets/poe_list.rs @@ -4,7 +4,7 @@ use crate::database::*; use glib::clone; use gtk::prelude::*; use gtk_macros::get_widget; -use libhandy::prelude::*; +use libadwaita::prelude::*; use std::cell::RefCell; use std::rc::Rc; @@ -64,7 +64,7 @@ impl PoeList { this.list.set_make_widget_cb(clone!(@strong this => move |index| { let poe = &this.data.borrow()[index]; - let row = libhandy::ActionRow::new(); + let row = libadwaita::ActionRow::new(); row.set_activatable(true); row.set_title(Some(&poe.get_title())); diff --git a/src/window.rs b/src/window.rs index 9530b6c..6129b16 100644 --- a/src/window.rs +++ b/src/window.rs @@ -13,9 +13,9 @@ use std::rc::Rc; pub struct Window { backend: Rc, - window: libhandy::ApplicationWindow, + window: libadwaita::ApplicationWindow, stack: gtk::Stack, - leaflet: libhandy::Leaflet, + leaflet: libadwaita::Leaflet, sidebar_box: gtk::Box, poe_list: Rc, navigator: Rc, @@ -27,11 +27,11 @@ impl Window { pub fn new(app: >k::Application) -> Rc { let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/window.ui"); - get_widget!(builder, libhandy::ApplicationWindow, window); + get_widget!(builder, libadwaita::ApplicationWindow, window); get_widget!(builder, gtk::Stack, stack); get_widget!(builder, gtk::Button, select_music_library_path_button); get_widget!(builder, gtk::Box, content_box); - get_widget!(builder, libhandy::Leaflet, leaflet); + get_widget!(builder, libadwaita::Leaflet, leaflet); get_widget!(builder, gtk::Button, add_button); get_widget!(builder, gtk::Box, sidebar_box); get_widget!(builder, gtk::Box, empty_screen);