Switch from libhandy to libadwaita

src/dialogs/login_dialog.rs

@@ -8,7 +8,7 @@ use std::rc::Rc;
 /// A dialog for entering login credentials.
 pub struct LoginDialog {
     backend: Rc<Backend>,
-    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);

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<Backend>,
-    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));

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<Backend>,
-    window: libhandy::Window,
+    window: libadwaita::Window,
     url_entry: gtk::Entry,
     selected_cb: RefCell<Option<Box<dyn Fn(String) -> ()>>>,
 }
@@ -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);

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<Backend>,
     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<Option<Person>>,
     ensemble: RefCell<Option<Ensemble>>,
@@ -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,

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<Backend>,
     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<List>,
@@ -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);

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<List>,
     part_list: Rc<List>,
@@ -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);

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<Backend>,
     widget: gtk::Box,
     title_entry: gtk::Entry,
-    composer_row: libhandy::ActionRow,
+    composer_row: libadwaita::ActionRow,
     reset_composer_button: gtk::Button,
     composer: RefCell<Option<Person>>,
     ready_cb: RefCell<Option<Box<dyn Fn(WorkPart) -> ()>>>,
@@ -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 {

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));

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));

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);

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<Box<dyn Source>>,
     widget: gtk::Box,
     save_button: gtk::Button,
-    recording_row: libhandy::ActionRow,
+    recording_row: libadwaita::ActionRow,
     track_list: Rc<List>,
     recording: RefCell<Option<Recording>>,
     tracks: RefCell<Vec<TrackData>>,
@@ -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));

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())

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()));

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()));

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));

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()

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()));

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));
 

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));
 

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()));
 

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()));
 

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));
 

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<Navigator>,
 }
 
@@ -14,11 +14,11 @@ impl NavigatorWindow {
     pub fn new<S: NavigatorScreen + 'static>(initial_screen: Rc<S>) -> Rc<Self> {
         // 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 });
 

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()));
 

src/window.rs

@@ -13,9 +13,9 @@ use std::rc::Rc;
 
 pub struct Window {
     backend: Rc<Backend>,
-    window: libhandy::ApplicationWindow,
+    window: libadwaita::ApplicationWindow,
     stack: gtk::Stack,
-    leaflet: libhandy::Leaflet,
+    leaflet: libadwaita::Leaflet,
     sidebar_box: gtk::Box,
     poe_list: Rc<PoeList>,
     navigator: Rc<Navigator>,
@@ -27,11 +27,11 @@ impl Window {
     pub fn new(app: &gtk::Application) -> Rc<Self> {
         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);