johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 19:57:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename 'libadwaita' to 'adw' where possible

Browse source
This commit is contained in:
Elias Projahn 2021-05-09 11:12:19 +02:00
parent c92eece842
commit 6a9e3c856a
36 changed files with 106 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
musicus/Cargo.toml
View file

@ -32,7 +32,7 @@ features = ["v2_64"]
git = "https://github.com/gtk-rs/gtk4-rs"
package = "gtk4"
[dependencies.libadwaita]
[dependencies.adw]
git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs.git"
package = "libadwaita"

2
musicus/src/editors/performance.rs
View file

@ -1,10 +1,10 @@
use crate::navigator::{NavigationHandle, Screen};
use crate::selectors::{EnsembleSelector, InstrumentSelector, PersonSelector};
use crate::widgets::{ButtonRow, Editor, Section, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Ensemble, Instrument, Performance, Person};
use std::cell::RefCell;
use std::rc::Rc;

8
musicus/src/editors/recording.rs
View file

@ -2,12 +2,12 @@ use super::performance::PerformanceEditor;
use crate::navigator::{NavigationHandle, Screen};
use crate::selectors::WorkSelector;
use crate::widgets::{List, Widget};
use adw::prelude::*;
use anyhow::Result;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::{generate_id, Performance, Recording, Work};
use std::cell::RefCell;
use std::rc::Rc;
@ -18,7 +18,7 @@ pub struct RecordingEditor {
widget: gtk::Stack,
save_button: gtk::Button,
info_bar: gtk::InfoBar,
work_row: libadwaita::ActionRow,
work_row: adw::ActionRow,
comment_entry: gtk::Entry,
upload_switch: gtk::Switch,
performance_list: Rc<List>,
@ -38,7 +38,7 @@ impl Screen<Option<Recording>, Recording> for 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, libadwaita::ActionRow, work_row);
get_widget!(builder, adw::ActionRow, work_row);
get_widget!(builder, gtk::Button, work_button);
get_widget!(builder, gtk::Entry, comment_entry);
get_widget!(builder, gtk::Switch, upload_switch);
@ -137,7 +137,7 @@ impl Screen<Option<Recording>, Recording> for RecordingEditor {
});
}));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&performance.get_title()));
row.add_suffix(&delete_button);

10
musicus/src/editors/work.rs
View file

@ -3,12 +3,12 @@ use super::work_section::WorkSectionEditor;
use crate::navigator::{NavigationHandle, Screen};
use crate::selectors::{InstrumentSelector, PersonSelector};
use crate::widgets::{List, Widget};
use adw::prelude::*;
use anyhow::Result;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::{generate_id, Instrument, Person, Work, WorkPart, WorkSection};
use std::cell::RefCell;
use std::rc::Rc;
@ -36,7 +36,7 @@ pub struct WorkEditor {
save_button: gtk::Button,
title_entry: gtk::Entry,
info_bar: gtk::InfoBar,
composer_row: libadwaita::ActionRow,
composer_row: adw::ActionRow,
upload_switch: gtk::Switch,
instrument_list: Rc<List>,
part_list: Rc<List>,
@ -59,7 +59,7 @@ impl Screen<Option<Work>, Work> for 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, libadwaita::ActionRow, composer_row);
get_widget!(builder, adw::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);
@ -162,7 +162,7 @@ impl Screen<Option<Work>, Work> for WorkEditor {
this.instrument_list.update(length);
}));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_title(Some(&instrument.name));
row.add_suffix(&delete_button);
@ -232,7 +232,7 @@ impl Screen<Option<Work>, Work> for WorkEditor {
});
}));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&pos.get_title()));
row.add_suffix(&delete_button);

8
musicus/src/import/import_screen.rs
View file

@ -3,10 +3,10 @@ use super::medium_preview::MediumPreview;
use crate::navigator::{NavigationHandle, Screen};
use crate::selectors::MediumSelector;
use crate::widgets::Widget;
use adw::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::Medium;
use musicus_backend::import::ImportSession;
use musicus_backend::Error;
@ -20,7 +20,7 @@ pub struct ImportScreen {
widget: gtk::Box,
server_check_button: gtk::CheckButton,
matching_stack: gtk::Stack,
error_row: libadwaita::ActionRow,
error_row: adw::ActionRow,
matching_list: gtk::ListBox,
}
@ -71,7 +71,7 @@ impl ImportScreen {
let this = self;
for medium in mediums {
let row = libadwaita::ActionRowBuilder::new()
let row = adw::ActionRowBuilder::new()
.title(&medium.name)
.subtitle(&format!("{} Tracks", medium.tracks.len()))
.activatable(true)
@ -113,7 +113,7 @@ impl Screen<Arc<ImportSession>, ()> for ImportScreen {
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, gtk::Stack, matching_stack);
get_widget!(builder, gtk::Button, try_again_button);
get_widget!(builder, libadwaita::ActionRow, error_row);
get_widget!(builder, adw::ActionRow, error_row);
get_widget!(builder, gtk::CheckButton, server_check_button);
get_widget!(builder, gtk::ListBox, matching_list);
get_widget!(builder, gtk::Button, select_button);

8
musicus/src/import/medium_editor.rs
View file

@ -1,12 +1,12 @@
use super::track_set_editor::{TrackData, TrackSetData, TrackSetEditor};
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::{List, Widget};
use adw::prelude::*;
use anyhow::Result;
use glib::clone;
use glib::prelude::*;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::{generate_id, Medium, Track};
use musicus_backend::import::ImportSession;
use std::cell::RefCell;
@ -21,7 +21,7 @@ pub struct MediumEditor {
done_button: gtk::Button,
name_entry: gtk::Entry,
publish_switch: gtk::Switch,
status_page: libadwaita::StatusPage,
status_page: adw::StatusPage,
track_set_list: Rc<List>,
track_sets: RefCell<Vec<TrackSetData>>,
}
@ -43,7 +43,7 @@ impl Screen<(Arc<ImportSession>, Option<Medium>), Medium> for MediumEditor {
get_widget!(builder, gtk::Switch, publish_switch);
get_widget!(builder, gtk::Button, add_button);
get_widget!(builder, gtk::Frame, frame);
get_widget!(builder, libadwaita::StatusPage, status_page);
get_widget!(builder, adw::StatusPage, status_page);
get_widget!(builder, gtk::Button, try_again_button);
get_widget!(builder, gtk::Button, cancel_button);
@ -120,7 +120,7 @@ impl Screen<(Arc<ImportSession>, Option<Medium>), Medium> for MediumEditor {
edit_button.set_valign(gtk::Align::Center);
edit_button.set_child(Some(&edit_image));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&title));
row.set_subtitle(Some(&subtitle));

8
musicus/src/import/medium_preview.rs
View file

@ -23,7 +23,7 @@ pub struct MediumPreview {
done_stack: gtk::Stack,
name_label: gtk::Label,
medium_box: gtk::Box,
status_page: libadwaita::StatusPage,
status_page: adw::StatusPage,
}
impl Screen<(Arc<ImportSession>, Medium), ()> for MediumPreview {
@ -43,7 +43,7 @@ impl Screen<(Arc<ImportSession>, Medium), ()> for MediumPreview {
get_widget!(builder, gtk::Stack, done_stack);
get_widget!(builder, gtk::Box, medium_box);
get_widget!(builder, gtk::Label, name_label);
get_widget!(builder, libadwaita::StatusPage, status_page);
get_widget!(builder, adw::StatusPage, status_page);
get_widget!(builder, gtk::Button, try_again_button);
let this = Rc::new(Self {
@ -143,7 +143,7 @@ impl MediumPreview {
.selection_mode(gtk::SelectionMode::None)
.build();
let header = libadwaita::ActionRowBuilder::new()
let header = adw::ActionRowBuilder::new()
.activatable(false)
.title(&track.recording.work.get_title())
.subtitle(&track.recording.get_performers())
@ -173,7 +173,7 @@ impl MediumPreview {
parts.join(", ")
};
let row = libadwaita::ActionRowBuilder::new()
let row = adw::ActionRowBuilder::new()
.activatable(false)
.title(&title)
.subtitle(&import_tracks[track.source_index].name)

4
musicus/src/import/source_selector.rs
View file

@ -12,7 +12,7 @@ use std::rc::Rc;
pub struct SourceSelector {
handle: NavigationHandle<()>,
widget: gtk::Stack,
status_page: libadwaita::StatusPage,
status_page: adw::StatusPage,
}
impl Screen<(), ()> for SourceSelector {
@ -26,7 +26,7 @@ impl Screen<(), ()> for SourceSelector {
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, gtk::Button, folder_button);
get_widget!(builder, gtk::Button, disc_button);
get_widget!(builder, libadwaita::StatusPage, status_page);
get_widget!(builder, adw::StatusPage, status_page);
get_widget!(builder, gtk::Button, try_again_button);
let this = Rc::new(Self {

4
musicus/src/import/track_editor.rs
View file

@ -1,9 +1,9 @@
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::Recording;
use std::cell::RefCell;
use std::rc::Rc;
@ -66,7 +66,7 @@ impl Screen<(Recording, Vec<usize>), Vec<usize>> for TrackEditor {
}
}));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.add_prefix(&check);
row.set_activatable_widget(Some(&check));
row.set_title(Some(&part.title));

4
musicus/src/import/track_selector.rs
View file

@ -1,9 +1,9 @@
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::import::ImportSession;
use std::cell::RefCell;
use std::rc::Rc;
@ -76,7 +76,7 @@ impl Screen<Arc<ImportSession>, Vec<usize>> for TrackSelector {
}
}));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.add_prefix(&check);
row.set_activatable_widget(Some(&check));
row.set_activatable(true);

8
musicus/src/import/track_set_editor.rs
View file

@ -3,11 +3,11 @@ use super::track_selector::TrackSelector;
use crate::navigator::{NavigationHandle, Screen};
use crate::selectors::RecordingSelector;
use crate::widgets::{List, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::Recording;
use musicus_backend::import::ImportSession;
use std::cell::RefCell;
@ -37,7 +37,7 @@ pub struct TrackSetEditor {
session: Arc<ImportSession>,
widget: gtk::Box,
save_button: gtk::Button,
recording_row: libadwaita::ActionRow,
recording_row: adw::ActionRow,
track_list: Rc<List>,
recording: RefCell<Option<Recording>>,
tracks: RefCell<Vec<TrackData>>,
@ -53,7 +53,7 @@ impl Screen<Arc<ImportSession>, TrackSetData> for TrackSetEditor {
get_widget!(builder, gtk::Box, widget);
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, libadwaita::ActionRow, recording_row);
get_widget!(builder, adw::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);
@ -145,7 +145,7 @@ impl Screen<Arc<ImportSession>, TrackSetData> for TrackSetEditor {
edit_button.set_valign(gtk::Align::Center);
edit_button.set_child(Some(&edit_image));
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&title));
row.set_subtitle(Some(track_name));

2
musicus/src/main.rs
View file

@ -27,7 +27,7 @@ fn main() {
gstreamer::init().expect("Failed to initialize GStreamer!");
gtk::init().expect("Failed to initialize GTK!");
libadwaita::init();
adw::init();
resources::init().expect("Failed to initialize resources!");
let app = gtk::Application::new(Some("de.johrpan.musicus"), gio::ApplicationFlags::empty());

4
musicus/src/navigator/window.rs
View file

@ -7,13 +7,13 @@ use std::rc::Rc;
/// A window hosting a navigator.
pub struct NavigatorWindow {
pub navigator: Rc<Navigator>,
window: libadwaita::Window,
window: adw::Window,
}
impl NavigatorWindow {
/// Create a new navigator window and show it.
pub fn new(backend: Rc<Backend>) -> Rc<Self> {
let window = libadwaita::Window::new();
let window = adw::Window::new();
window.set_default_size(600, 424);
let placeholder = gtk::Label::new(None);
let navigator = Navigator::new(backend, &window, &placeholder);

18
musicus/src/preferences/mod.rs
View file

@ -1,9 +1,9 @@
use crate::navigator::NavigatorWindow;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::Backend;
use std::rc::Rc;
@ -18,10 +18,10 @@ mod register;
/// A dialog for configuring the app.
pub struct Preferences {
backend: Rc<Backend>,
window: libadwaita::Window,
music_library_path_row: libadwaita::ActionRow,
url_row: libadwaita::ActionRow,
login_row: libadwaita::ActionRow,
window: adw::Window,
music_library_path_row: adw::ActionRow,
url_row: adw::ActionRow,
login_row: adw::ActionRow,
}
impl Preferences {
@ -30,12 +30,12 @@ impl Preferences {
// Create UI
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/preferences.ui");
get_widget!(builder, libadwaita::Window, window);
get_widget!(builder, libadwaita::ActionRow, music_library_path_row);
get_widget!(builder, adw::Window, window);
get_widget!(builder, adw::ActionRow, music_library_path_row);
get_widget!(builder, gtk::Button, select_music_library_path_button);
get_widget!(builder, libadwaita::ActionRow, url_row);
get_widget!(builder, adw::ActionRow, url_row);
get_widget!(builder, gtk::Button, url_button);
get_widget!(builder, libadwaita::ActionRow, login_row);
get_widget!(builder, adw::ActionRow, login_row);
get_widget!(builder, gtk::Button, login_button);
window.set_transient_for(Some(parent));

6
musicus/src/preferences/register.rs
View file

@ -1,9 +1,9 @@
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::client::{LoginData, UserRegistration};
use std::cell::RefCell;
use std::rc::Rc;
@ -16,7 +16,7 @@ pub struct RegisterDialog {
email_entry: gtk::Entry,
password_entry: gtk::Entry,
repeat_password_entry: gtk::Entry,
captcha_row: libadwaita::ActionRow,
captcha_row: adw::ActionRow,
captcha_entry: gtk::Entry,
captcha_id: RefCell<Option<String>>,
}
@ -34,7 +34,7 @@ impl Screen<(), LoginData> for RegisterDialog {
get_widget!(builder, gtk::Entry, email_entry);
get_widget!(builder, gtk::Entry, password_entry);
get_widget!(builder, gtk::Entry, repeat_password_entry);
get_widget!(builder, libadwaita::ActionRow, captcha_row);
get_widget!(builder, adw::ActionRow, captcha_row);
get_widget!(builder, gtk::Entry, captcha_entry);
let this = Rc::new(Self {

4
musicus/src/preferences/server.rs
View file

@ -8,7 +8,7 @@ use std::rc::Rc;
/// A dialog for setting up the server.
pub struct ServerDialog {
backend: Rc<Backend>,
window: libadwaita::Window,
window: adw::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, libadwaita::Window, window);
get_widget!(builder, adw::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, set_button);
get_widget!(builder, gtk::Entry, url_entry);

6
musicus/src/screens/ensemble.rs
View file

@ -3,10 +3,10 @@ use crate::editors::EnsembleEditor;
use crate::navigator::{NavigationHandle, NavigatorWindow, Screen};
use crate::widgets;
use crate::widgets::{List, Section, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Ensemble, Medium, Recording};
use std::cell::RefCell;
use std::rc::Rc;
@ -75,7 +75,7 @@ impl Screen<Ensemble, ()> for EnsembleScreen {
clone!(@weak this => @default-panic, move |index| {
let recording = &this.recordings.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.work.get_title()));
row.set_subtitle(Some(&recording.get_performers()));
@ -104,7 +104,7 @@ impl Screen<Ensemble, ()> for EnsembleScreen {
.set_make_widget_cb(clone!(@weak this => @default-panic, move |index| {
let medium = &this.mediums.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&medium.name));

8
musicus/src/screens/main.rs
View file

@ -4,11 +4,11 @@ use crate::import::SourceSelector;
use crate::navigator::{NavigationHandle, Navigator, NavigatorWindow, Screen};
use crate::preferences::Preferences;
use crate::widgets::{List, PlayerBar, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::{Ensemble, Person};
use std::cell::RefCell;
use std::rc::Rc;
@ -35,7 +35,7 @@ impl PersonOrEnsemble {
pub struct MainScreen {
handle: NavigationHandle<()>,
widget: gtk::Box,
leaflet: libadwaita::Leaflet,
leaflet: adw::Leaflet,
search_entry: gtk::SearchEntry,
stack: gtk::Stack,
poe_list: Rc<List>,
@ -49,7 +49,7 @@ impl Screen<(), ()> for MainScreen {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/main_screen.ui");
get_widget!(builder, gtk::Box, widget);
get_widget!(builder, libadwaita::Leaflet, leaflet);
get_widget!(builder, adw::Leaflet, leaflet);
get_widget!(builder, gtk::Button, add_button);
get_widget!(builder, gtk::SearchEntry, search_entry);
get_widget!(builder, gtk::Stack, stack);
@ -111,7 +111,7 @@ impl Screen<(), ()> for MainScreen {
.set_make_widget_cb(clone!(@weak this => @default-panic, move |index| {
let poe = &this.poes.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&poe.get_title()));

4
musicus/src/screens/medium.rs
View file

@ -1,10 +1,10 @@
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets;
use crate::widgets::{List, Section, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::Medium;
use std::rc::Rc;
@ -77,7 +77,7 @@ impl Screen<Medium, ()> for MediumScreen {
parts.join(", ")
};
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_selectable(false);
row.set_activatable(false);
row.set_title(Some(&title));

8
musicus/src/screens/person.rs
View file

@ -3,10 +3,10 @@ use crate::editors::PersonEditor;
use crate::navigator::{NavigationHandle, NavigatorWindow, Screen};
use crate::widgets;
use crate::widgets::{List, Section, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Medium, Person, Recording, Work};
use std::cell::RefCell;
use std::rc::Rc;
@ -81,7 +81,7 @@ impl Screen<Person, ()> for PersonScreen {
.set_make_widget_cb(clone!(@weak this => @default-panic, move |index| {
let work = &this.works.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&work.title));
@ -108,7 +108,7 @@ impl Screen<Person, ()> for PersonScreen {
clone!(@weak this => @default-panic, move |index| {
let recording = &this.recordings.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.work.get_title()));
row.set_subtitle(Some(&recording.get_performers()));
@ -137,7 +137,7 @@ impl Screen<Person, ()> for PersonScreen {
.set_make_widget_cb(clone!(@weak this => @default-panic, move |index| {
let medium = &this.mediums.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&medium.name));

4
musicus/src/screens/player.rs
View file

@ -1,10 +1,10 @@
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::{List, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use musicus_backend::db::Track;
use std::cell::{Cell, RefCell};
use std::rc::Rc;
@ -224,7 +224,7 @@ impl Screen<(), ()> for PlayerScreen {
parts.join(", ")
};
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_selectable(false);
row.set_activatable(true);
row.set_title(Some(&title));

4
musicus/src/screens/recording.rs
View file

@ -2,10 +2,10 @@ use crate::editors::RecordingEditor;
use crate::navigator::{NavigationHandle, NavigatorWindow, Screen};
use crate::widgets;
use crate::widgets::{List, Section, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Recording, Track};
use std::cell::RefCell;
use std::rc::Rc;
@ -87,7 +87,7 @@ impl Screen<Recording, ()> for RecordingScreen {
title_parts.join(", ")
};
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_title(Some(&title));
row.upcast()

6
musicus/src/screens/welcome.rs
View file

@ -19,8 +19,8 @@ impl Screen<(), ()> for WelcomeScreen {
.orientation(gtk::Orientation::Vertical)
.build();
let header = libadwaita::HeaderBarBuilder::new()
.title_widget(&libadwaita::WindowTitle::new(Some("Musicus"), None))
let header = adw::HeaderBarBuilder::new()
.title_widget(&adw::WindowTitle::new(Some("Musicus"), None))
.build();
let button = gtk::ButtonBuilder::new()
@ -28,7 +28,7 @@ impl Screen<(), ()> for WelcomeScreen {
.label(&gettext("Select folder"))
.build();
let welcome = libadwaita::StatusPageBuilder::new()
let welcome = adw::StatusPageBuilder::new()
.icon_name("folder-music-symbolic")
.title(&gettext("Welcome to Musicus!"))
.description(&gettext(

4
musicus/src/screens/work.rs
View file

@ -3,10 +3,10 @@ use crate::editors::WorkEditor;
use crate::navigator::{NavigationHandle, NavigatorWindow, Screen};
use crate::widgets;
use crate::widgets::{List, Section, Widget};
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Recording, Work};
use std::cell::RefCell;
use std::rc::Rc;
@ -70,7 +70,7 @@ impl Screen<Work, ()> for WorkScreen {
clone!(@weak this => @default-panic, move |index| {
let recording = &this.recordings.borrow()[index];
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.work.get_title()));
row.set_subtitle(Some(&recording.get_performers()));

4
musicus/src/selectors/ensemble.rs
View file

@ -2,10 +2,10 @@ use super::selector::Selector;
use crate::editors::EnsembleEditor;
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::Ensemble;
use std::rc::Rc;
@ -53,7 +53,7 @@ impl Screen<(), Ensemble> for EnsembleSelector {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |ensemble| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&ensemble.name));

4
musicus/src/selectors/instrument.rs
View file

@ -2,10 +2,10 @@ use super::selector::Selector;
use crate::editors::InstrumentEditor;
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::Instrument;
use std::rc::Rc;
@ -53,7 +53,7 @@ impl Screen<(), Instrument> for InstrumentSelector {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |instrument| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&instrument.name));

6
musicus/src/selectors/medium.rs
View file

@ -1,10 +1,10 @@
use super::selector::Selector;
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Ensemble, Medium, Person};
use std::rc::Rc;
@ -87,7 +87,7 @@ impl Screen<(), Medium> for MediumSelector {
}));
this.selector.set_make_widget(clone!(@weak this => @default-panic, move |poe| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&poe.get_title()));
@ -161,7 +161,7 @@ impl Screen<PersonOrEnsemble, Medium> for MediumSelectorMediumScreen {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |medium| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&medium.name));

4
musicus/src/selectors/person.rs
View file

@ -2,10 +2,10 @@ use super::selector::Selector;
use crate::editors::PersonEditor;
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::Person;
use std::rc::Rc;
@ -53,7 +53,7 @@ impl Screen<(), Person> for PersonSelector {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |person| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&person.name_lf()));

8
musicus/src/selectors/recording.rs
View file

@ -2,10 +2,10 @@ use super::selector::Selector;
use crate::editors::{PersonEditor, RecordingEditor, WorkEditor};
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Person, Recording, Work};
use std::rc::Rc;
@ -62,7 +62,7 @@ impl Screen<(), Recording> for RecordingSelector {
}));
this.selector.set_make_widget(clone!(@weak this => @default-panic, move |person| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&person.name_lf()));
@ -143,7 +143,7 @@ impl Screen<Person, Work> for RecordingSelectorWorkScreen {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |work| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&work.title));
@ -210,7 +210,7 @@ impl Screen<Work, Recording> for RecordingSelectorRecordingScreen {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |recording| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&recording.get_performers()));

6
musicus/src/selectors/work.rs
View file

@ -2,10 +2,10 @@ use super::selector::Selector;
use crate::editors::{PersonEditor, WorkEditor};
use crate::navigator::{NavigationHandle, Screen};
use crate::widgets::Widget;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use gtk::prelude::*;
use libadwaita::prelude::*;
use musicus_backend::db::{Person, Work};
use std::rc::Rc;
@ -56,7 +56,7 @@ impl Screen<(), Work> for WorkSelector {
}));
this.selector.set_make_widget(clone!(@weak this => @default-panic, move |person| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&person.name_lf()));
@ -133,7 +133,7 @@ impl Screen<Person, Work> for WorkSelectorWorkScreen {
this.selector
.set_make_widget(clone!(@weak this => @default-panic, move |work| {
let row = libadwaita::ActionRow::new();
let row = adw::ActionRow::new();
row.set_activatable(true);
row.set_title(Some(&work.title));

6
musicus/src/widgets/button_row.rs
View file

@ -1,11 +1,11 @@
use super::Widget;
use adw::prelude::*;
use gtk::prelude::*;
use libadwaita::prelude::*;
/// A list box row with a single button.
pub struct ButtonRow {
/// The actual GTK widget.
pub widget: libadwaita::ActionRow,
pub widget: adw::ActionRow,
/// The managed button.
button: gtk::Button,
@ -19,7 +19,7 @@ impl ButtonRow {
.label(label)
.build();
let widget = libadwaita::ActionRowBuilder::new()
let widget = adw::ActionRowBuilder::new()
.activatable(true)
.activatable_widget(&button)
.title(title)

8
musicus/src/widgets/editor.rs
View file

@ -12,7 +12,7 @@ pub struct Editor {
back_button: gtk::Button,
/// The title widget within the header bar.
window_title: libadwaita::WindowTitle,
window_title: adw::WindowTitle,
/// The button to save the edited item.
save_button: gtk::Button,
@ -21,7 +21,7 @@ pub struct Editor {
content_box: gtk::Box,
/// The status page for the error screen.
status_page: libadwaita::StatusPage,
status_page: adw::StatusPage,
}
impl Editor {
@ -31,10 +31,10 @@ impl Editor {
get_widget!(builder, gtk::Stack, widget);
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, libadwaita::WindowTitle, window_title);
get_widget!(builder, adw::WindowTitle, window_title);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Box, content_box);
get_widget!(builder, libadwaita::StatusPage, status_page);
get_widget!(builder, adw::StatusPage, status_page);
get_widget!(builder, gtk::Button, try_again_button);
try_again_button.connect_clicked(clone!(@strong widget => move |_| {

6
musicus/src/widgets/entry_row.rs
View file

@ -1,10 +1,10 @@
use adw::prelude::*;
use gtk::prelude::*;
use libadwaita::prelude::*;
/// A list box row with an entry.
pub struct EntryRow {
/// The actual GTK widget.
pub widget: libadwaita::ActionRow,
pub widget: adw::ActionRow,
/// The managed entry.
pub entry: gtk::Entry,
@ -18,7 +18,7 @@ impl EntryRow {
.valign(gtk::Align::Center)
.build();
let widget = libadwaita::ActionRowBuilder::new()
let widget = adw::ActionRowBuilder::new()
.activatable(true)
.activatable_widget(&entry)
.title(title)

4
musicus/src/widgets/screen.rs
View file

@ -13,7 +13,7 @@ pub struct Screen {
back_button: gtk::Button,
/// The title widget within the header bar.
window_title: libadwaita::WindowTitle,
window_title: adw::WindowTitle,
/// The action menu.
menu: gio::Menu,
@ -38,7 +38,7 @@ impl Screen {
get_widget!(builder, gtk::Box, widget);
get_widget!(builder, gtk::Button, back_button);
get_widget!(builder, libadwaita::WindowTitle, window_title);
get_widget!(builder, adw::WindowTitle, window_title);
get_widget!(builder, gio::Menu, menu);
get_widget!(builder, gtk::ToggleButton, search_button);
get_widget!(builder, gtk::SearchEntry, search_entry);

4
musicus/src/widgets/upload_section.rs
View file

@ -1,7 +1,7 @@
use super::Section;
use adw::prelude::*;
use gettextrs::gettext;
use glib::clone;
use libadwaita::prelude::*;
use musicus_backend::Backend;
use std::rc::Rc;
@ -28,7 +28,7 @@ impl UploadSection {
.valign(gtk::Align::Center)
.build();
let row = libadwaita::ActionRowBuilder::new()
let row = adw::ActionRowBuilder::new()
.title("Upload changes to the server")
.activatable(true)
.activatable_widget(&switch)

8
musicus/src/window.rs
View file

@ -7,7 +7,7 @@ use std::rc::Rc;
/// The main window of this application. This will also handle initializing and managing the
/// backend.
pub struct Window {
window: libadwaita::ApplicationWindow,
window: adw::ApplicationWindow,
backend: Rc<Backend>,
navigator: Rc<Navigator>,
}
@ -16,7 +16,7 @@ impl Window {
pub fn new(app: &gtk::Application) -> Rc<Self> {
let backend = Rc::new(Backend::new());
let window = libadwaita::ApplicationWindow::new(app);
let window = adw::ApplicationWindow::new(app);
window.set_title(Some("Musicus"));
window.set_default_size(1000, 707);
@ -24,8 +24,8 @@ impl Window {
.orientation(gtk::Orientation::Vertical)
.build();
let header = libadwaita::HeaderBarBuilder::new()
.title_widget(&libadwaita::WindowTitle::new(Some("Musicus"), None))
let header = adw::HeaderBarBuilder::new()
.title_widget(&adw::WindowTitle::new(Some("Musicus"), None))
.build();
let spinner = gtk::SpinnerBuilder::new()