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

Switch all windows to libhandy

Browse source
This commit is contained in:
Elias Projahn 2020-11-03 17:53:13 +01:00
parent b54fc5d200
commit f580c4e243
28 changed files with 1665 additions and 1447 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/dialogs/ensemble_editor.rs
View file

@ -10,7 +10,7 @@ where
F: Fn(Ensemble) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
id: i64,
name_entry: gtk::Entry,
@ -29,7 +29,7 @@ where
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/ensemble_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, name_entry);

4
src/dialogs/ensemble_selector.rs
View file

@ -14,7 +14,7 @@ where
F: Fn(Ensemble) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
list: gtk::ListBox,
search_entry: gtk::SearchEntry,
@ -28,7 +28,7 @@ where
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/ensemble_selector.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, add_button);
get_widget!(builder, gtk::SearchEntry, search_entry);
get_widget!(builder, gtk::ListBox, list);

4
src/dialogs/instrument_editor.rs
View file

@ -10,7 +10,7 @@ where
F: Fn(Instrument) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
id: i64,
name_entry: gtk::Entry,
@ -29,7 +29,7 @@ where
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/instrument_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, name_entry);

4
src/dialogs/instrument_selector.rs
View file

@ -14,7 +14,7 @@ where
F: Fn(Instrument) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
list: gtk::ListBox,
search_entry: gtk::SearchEntry,
@ -28,7 +28,7 @@ where
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/instrument_selector.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, add_button);
get_widget!(builder, gtk::SearchEntry, search_entry);
get_widget!(builder, gtk::ListBox, list);

4
src/dialogs/part_editor.rs
View file

@ -12,7 +12,7 @@ use std::rc::Rc;
pub struct PartEditor {
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
title_entry: gtk::Entry,
composer: RefCell<Option<Person>>,
composer_label: gtk::Label,
@ -29,7 +29,7 @@ impl PartEditor {
) -> Rc<Self> {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/part_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, title_entry);

4
src/dialogs/performance_editor.rs
View file

@ -13,7 +13,7 @@ where
F: Fn(PerformanceDescription) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
save_button: gtk::Button,
person_label: gtk::Label,
@ -37,7 +37,7 @@ where
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/performance_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Button, person_button);

4
src/dialogs/person_editor.rs
View file

@ -10,7 +10,7 @@ where
F: Fn(Person) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
id: i64,
first_name_entry: gtk::Entry,
@ -29,7 +29,7 @@ where
) -> Rc<Self> {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, first_name_entry);

10
src/dialogs/person_selector.rs
View file

@ -9,7 +9,7 @@ use gtk_macros::get_widget;
use std::rc::Rc;
pub struct PersonSelector {
window: gtk::Window,
window: libhandy::Window,
}
impl PersonSelector {
@ -18,10 +18,10 @@ impl PersonSelector {
P: IsA<gtk::Window>,
F: Fn(Person) -> () + 'static,
{
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_selector.ui");
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/person_selector.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Box, vbox);
get_widget!(builder, gtk::Button, add_button);
let callback = Rc::new(callback);
@ -33,8 +33,8 @@ impl PersonSelector {
callback(person.clone());
}));
vbox.pack_start(&list.widget, true, true, 0);
window.set_transient_for(Some(parent));
window.add(&list.widget);
add_button.connect_clicked(
clone!(@strong backend, @strong window, @strong callback => move |_| {

4
src/dialogs/preferences.rs
View file

@ -7,14 +7,14 @@ use libhandy::prelude::*;
use std::rc::Rc;
pub struct Preferences {
window: gtk::Window,
window: libhandy::Window,
}
impl Preferences {
pub fn new<P: IsA<gtk::Window>>(backend: Rc<Backend>, parent: &P) -> Self {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/preferences.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, libhandy::ActionRow, music_library_path_row);
get_widget!(builder, gtk::Button, select_music_library_path_button);

4
src/dialogs/recording_editor.rs
View file

@ -14,7 +14,7 @@ where
F: Fn(RecordingDescription) -> () + 'static,
{
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
id: i64,
save_button: gtk::Button,
@ -38,7 +38,7 @@ where
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/recording_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Button, work_button);

4
src/dialogs/recording_selector.rs
View file

@ -14,7 +14,7 @@ use std::rc::Rc;
pub struct RecordingSelector {
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: Box<dyn Fn(RecordingDescription) -> () + 'static>,
leaflet: libhandy::Leaflet,
navigator: Rc<Navigator>,
@ -28,7 +28,7 @@ impl RecordingSelector {
{
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/recording_selector.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, libhandy::Leaflet, leaflet);
get_widget!(builder, gtk::Button, add_button);
get_widget!(builder, gtk::Box, sidebar_box);

4
src/dialogs/section_editor.rs
View file

@ -5,7 +5,7 @@ use gtk_macros::get_widget;
use std::rc::Rc;
pub struct SectionEditor {
window: gtk::Window,
window: libhandy::Window,
title_entry: gtk::Entry,
}
@ -18,7 +18,7 @@ impl SectionEditor {
let builder =
gtk::Builder::from_resource("/de/johrpan/musicus/ui/section_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, title_entry);

4
src/dialogs/track_editor.rs
View file

@ -7,7 +7,7 @@ use std::convert::TryInto;
use std::rc::Rc;
pub struct TrackEditor {
window: gtk::Window,
window: libhandy::Window,
}
impl TrackEditor {
@ -18,7 +18,7 @@ impl TrackEditor {
{
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/track_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::ListBox, list);

4
src/dialogs/tracks_editor.rs
View file

@ -10,7 +10,7 @@ use std::cell::RefCell;
use std::rc::Rc;
pub struct TracksEditor {
window: gtk::Window,
window: libhandy::Window,
}
impl TracksEditor {
@ -21,7 +21,7 @@ impl TracksEditor {
) -> Self {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/tracks_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Button, recording_button);

4
src/dialogs/work_editor.rs
View file

@ -54,7 +54,7 @@ pub struct WorkEditor<F>
where
F: Fn(WorkDescription) -> () + 'static, {
backend: Rc<Backend>,
window: gtk::Window,
window: libhandy::Window,
callback: F,
save_button: gtk::Button,
id: i64,
@ -78,7 +78,7 @@ where
) -> Rc<Self> {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus/ui/work_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, libhandy::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Entry, title_entry);