johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-27 12:17:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch from libhandy to libadwaita

Browse source
This commit is contained in:
Elias Projahn 2021-01-29 15:17:27 +01:00
parent 88c7256c51
commit 6378556546
52 changed files with 198 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/editors/performance.rs
View file

@ -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,

8
src/editors/recording.rs
View file

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

10
src/editors/work.rs
View file

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

6
src/editors/work_part.rs
View file

@ -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 {