From f580c4e243c9e3037469044171b0567f27be3771 Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Tue, 3 Nov 2020 17:53:13 +0100 Subject: [PATCH] Switch all windows to libhandy --- res/ui/ensemble_editor.ui | 131 +++--- res/ui/ensemble_selector.ui | 78 ++-- res/ui/instrument_editor.ui | 119 +++--- res/ui/instrument_selector.ui | 100 +++-- res/ui/part_editor.ui | 458 ++++++++++---------- res/ui/performance_editor.ui | 336 ++++++++------- res/ui/person_editor.ui | 165 ++++---- res/ui/person_selector.ui | 39 +- res/ui/recording_editor.ui | 326 ++++++++------- res/ui/section_editor.ui | 119 +++--- res/ui/track_editor.ui | 92 ++-- res/ui/tracks_editor.ui | 436 +++++++++---------- res/ui/work_editor.ui | 647 +++++++++++++++-------------- src/dialogs/ensemble_editor.rs | 4 +- src/dialogs/ensemble_selector.rs | 4 +- src/dialogs/instrument_editor.rs | 4 +- src/dialogs/instrument_selector.rs | 4 +- src/dialogs/part_editor.rs | 4 +- src/dialogs/performance_editor.rs | 4 +- src/dialogs/person_editor.rs | 4 +- src/dialogs/person_selector.rs | 10 +- src/dialogs/preferences.rs | 4 +- src/dialogs/recording_editor.rs | 4 +- src/dialogs/recording_selector.rs | 4 +- src/dialogs/section_editor.rs | 4 +- src/dialogs/track_editor.rs | 4 +- src/dialogs/tracks_editor.rs | 4 +- src/dialogs/work_editor.rs | 4 +- 28 files changed, 1665 insertions(+), 1447 deletions(-) diff --git a/res/ui/ensemble_editor.ui b/res/ui/ensemble_editor.ui index 21fe56c..22f5534 100644 --- a/res/ui/ensemble_editor.ui +++ b/res/ui/ensemble_editor.ui @@ -1,72 +1,91 @@ - + - - False + + + False True - True - dialog + True + dialog - + True - False - 18 - 12 - 6 + False + vertical - + True - False - end - Name + False + Ensemble + + + Cancel + True + True + True + + + + + Save + True + True + True + + + + end + 1 + + - 0 - 0 - - - - - True - True - True - - - 1 - 0 - - - - - - - True - False - Ensemble - - - Cancel - True - True - True - - - - - Save - True - True - True - - - - end + False + True 1 + + + + True + False + 18 + 12 + 6 + + + True + False + end + Name + + + 0 + 0 + + + + + True + True + True + + + 1 + 0 + + + + + False + True + 2 + + diff --git a/res/ui/ensemble_selector.ui b/res/ui/ensemble_selector.ui index 9aec87a..e36f185 100644 --- a/res/ui/ensemble_selector.ui +++ b/res/ui/ensemble_selector.ui @@ -2,7 +2,8 @@ - + + False True 350 @@ -15,16 +16,25 @@ False vertical - + True - True - 6 - 6 - 6 - 6 - edit-find-symbolic - False - False + False + Select ensemble + True + + + True + True + True + + + True + False + list-add-symbolic + + + + False @@ -32,15 +42,37 @@ 0 + + + True + False + True + + + True + True + True + edit-find-symbolic + False + False + + + + + False + True + 1 + + True True - in True False + none True @@ -60,32 +92,10 @@ True True - 1 + 2 - - - True - False - Select ensemble - True - - - True - True - True - - - True - False - list-add-symbolic - - - - - - diff --git a/res/ui/instrument_editor.ui b/res/ui/instrument_editor.ui index c77eb81..7a5be09 100644 --- a/res/ui/instrument_editor.ui +++ b/res/ui/instrument_editor.ui @@ -1,69 +1,88 @@ - + - - False + + + False True - True - dialog + True + dialog - + True - False - 18 - 12 - 6 + False + vertical - + True - False - end - Name + False + Instrument + + + Cancel + True + True + True + + + + + Save + True + True + True + + + + end + 1 + + - 0 - 0 + False + True + 0 - + + True - True - True + False + 18 + 12 + 6 + + + True + False + end + Name + + + 0 + 0 + + + + + True + True + True + + + 1 + 0 + + - 1 - 0 - - - - - - - True - False - Instrument - - - Cancel - True - True - True - - - - - Save - True - True - True - - - - end + False + True 1 diff --git a/res/ui/instrument_selector.ui b/res/ui/instrument_selector.ui index 301c7f3..75e1975 100644 --- a/res/ui/instrument_selector.ui +++ b/res/ui/instrument_selector.ui @@ -1,30 +1,40 @@ - + - - False + + + False True - 350 - 300 - True - dialog + 350 + 300 + True + dialog True - False + False vertical - + True - True - 6 - 6 - 6 - 6 - edit-find-symbolic - False - False + False + Select instrument + True + + + True + True + True + + + True + False + list-add-symbolic + + + + False @@ -32,23 +42,45 @@ 0 + + + True + False + True + + + True + True + True + edit-find-symbolic + False + False + + + + + False + True + 1 + + True - True - in + True + in True - False + False True - False + False True - False + False No instruments found. @@ -60,32 +92,10 @@ True True - 1 + 2 - - - True - False - Select instrument - True - - - True - True - True - - - True - False - list-add-symbolic - - - - - - diff --git a/res/ui/part_editor.ui b/res/ui/part_editor.ui index 10c372f..b876306 100644 --- a/res/ui/part_editor.ui +++ b/res/ui/part_editor.ui @@ -2,7 +2,8 @@ - + + False True 450 @@ -10,252 +11,269 @@ True dialog - + True - True + False + vertical - - + True False - 18 - 12 - 6 + Work part - - True - False - end - Composer - - - 0 - 1 - - - - + + Cancel True True - True + True - - 1 - 0 - - + + Save True - False - end - Title - - - 0 - 0 - - - - - True - False - True - - - True - True - True - True - - - True - False - start - Select … - - - - - False - True - 0 - - - - - True - True - True - - - True - False - user-trash-symbolic - - - - - False - True - 1 - - + True + True - 1 - 1 - - - - - - - True - False - Overview - - - False - - - - - True - False - 18 - 6 - - - True - True - in - - - True - False - - - True - False - True - True - - - True - False - No instruments added. - - - - - - - - - True - True - 0 - - - - - True - False - 0 - vertical - 6 - - - True - True - True - - - True - False - list-add-symbolic - - - - - False - True - 0 - - - - - True - True - True - - - True - False - list-remove-symbolic - - - - - False - True - 1 - - - - - False - True + end 1 - 1 + False + True + 0 - - - True - False - Instruments - - - 1 - False - - - - - - - True - False - Work part - - Cancel + True True - True - - - - - Save - True - True - True - + + + + True + False + 18 + 12 + 6 + + + True + False + end + Composer + + + 0 + 1 + + + + + True + True + True + + + 1 + 0 + + + + + True + False + end + Title + + + 0 + 0 + + + + + True + False + True + + + True + True + True + True + + + True + False + start + Select … + + + + + False + True + 0 + + + + + True + True + True + + + True + False + user-trash-symbolic + + + + + False + True + 1 + + + + + + 1 + 1 + + + + + + + True + False + Overview + + + False + + + + + True + False + 18 + 6 + + + True + True + in + + + True + False + + + True + False + True + True + + + True + False + No instruments added. + + + + + + + + + True + True + 0 + + + + + True + False + 0 + vertical + 6 + + + True + True + True + + + True + False + list-add-symbolic + + + + + False + True + 0 + + + + + True + True + True + + + True + False + list-remove-symbolic + + + + + False + True + 1 + + + + + False + True + 1 + + + + + 1 + + + + + True + False + Instruments + + + 1 + False + + - end + True + True 1 diff --git a/res/ui/performance_editor.ui b/res/ui/performance_editor.ui index a830121..2e85510 100644 --- a/res/ui/performance_editor.ui +++ b/res/ui/performance_editor.ui @@ -2,127 +2,85 @@ - + + False True True dialog - - + True False - 18 - 12 - 6 + vertical - + True False - Role - 1 - - - 0 - 2 - - - - - True - False - True + Performance - + + Cancel True True True - - - True - False - start - Select … - - - - True - True - 0 - - + + Save True + False True True - - - True - False - user-trash-symbolic - - + - False - False + end 1 - - 1 - 2 + False + True + 0 - + + True False - Type - right - 1 - - - 0 - 0 - - - - - True - False - crossfade + 18 + 12 + 6 + + + True + False + Role + 1 + + + 0 + 2 + + True False - 6 + True - - True - False - Person - 1 - - - False - True - 0 - - - - + True True True - + True False start @@ -133,108 +91,168 @@ True True - 1 - - - - - person - Person - - - - - True - False - 6 - - - True - False - end - Ensemble - - - False - True 0 - + True True True - + True False - start - Select … + user-trash-symbolic - True - True + False + False + 1 + + + + + + 1 + 2 + + + + + True + False + Type + right + 1 + + + 0 + 0 + + + + + True + False + crossfade + + + True + False + 6 + + + True + False + Person + 1 + + + False + True + 0 + + + + + True + True + True + + + True + False + start + Select … + + + + + True + True + 1 + + + + + person + Person + + + + + True + False + 6 + + + True + False + end + Ensemble + + + False + True + 0 + + + + + True + True + True + + + True + False + start + Select … + + + + + True + True + 1 + + + + + ensemble + Ensemble 1 - ensemble - Ensemble - 1 + 0 + 1 + 2 + + + + + True + False + True + True + stack + + + 1 + 0 - 0 - 1 - 2 - - - - - True - False - True - True - stack - - - 1 - 0 - - - - - - - True - False - Performance - - - Cancel - True - True - True - - - - - Save - True - False - True - True - - - - end + False + True 1 diff --git a/res/ui/person_editor.ui b/res/ui/person_editor.ui index e99de6e..bf5bd05 100644 --- a/res/ui/person_editor.ui +++ b/res/ui/person_editor.ui @@ -1,92 +1,111 @@ - + - - False + + + False True - True - dialog + True + dialog - + True - False - 18 - 12 - 6 + False + vertical - + True - False - end - First name + False + Person + + + Cancel + True + True + True + + + + + Save + True + True + True + + + + end + 1 + + - 0 - 0 + False + True + 0 - + + True - True - True + False + 18 + 12 + 6 + + + True + False + end + First name + + + 0 + 0 + + + + + True + True + True + + + 1 + 0 + + + + + True + False + end + Last name + + + 0 + 1 + + + + + True + True + True + + + 1 + 1 + + - 1 - 0 - - - - - True - False - end - Last name - - - 0 - 1 - - - - - True - True - True - - - 1 - 1 - - - - - - - True - False - Person - - - Cancel - True - True - True - - - - - Save - True - True - True - - - - end + False + True 1 diff --git a/res/ui/person_selector.ui b/res/ui/person_selector.ui index eea780b..9f737a5 100644 --- a/res/ui/person_selector.ui +++ b/res/ui/person_selector.ui @@ -2,7 +2,8 @@ - + + False True 350 @@ -10,27 +11,39 @@ True dialog - - - - + True False - Select person - True + vertical - + True - True - True + False + Select person + True - + True - False - list-add-symbolic + True + True + + + True + False + list-add-symbolic + + + + False + True + 0 + + + + diff --git a/res/ui/recording_editor.ui b/res/ui/recording_editor.ui index d6835ff..c9871f2 100644 --- a/res/ui/recording_editor.ui +++ b/res/ui/recording_editor.ui @@ -2,7 +2,8 @@ - + + False True 500 @@ -10,159 +11,226 @@ True dialog - + True - True + False + vertical - - + True False - 18 - 12 - 6 + Recording - - True - False - end - Comment - - - 0 - 1 - - - - + + Cancel True True True - True - - - True - False - start - Select … - - - - 1 - 0 - - + + Save True + False True + True + - 1 - 1 + end + 1 - - - True - False - end - Work - - - 0 - 0 - - - - - - - True - False - Overview - False + False + True + 0 - + True - False - 18 - 6 + True - + + True - True - in + False + 18 + 12 + 6 - + True False + end + Comment + + + 0 + 1 + + + + + True + True + True + True - + True False - True - True - - - True - False - No performers added. - - + start + Select … + + 1 + 0 + + + + + True + True + + + 1 + 1 + + + + + True + False + end + Work + + + 0 + 0 + + + + + True + False + Overview + - True - True - 0 + False True False - 0 - vertical + 18 6 - + True True - True + in - + True False - list-add-symbolic + + + True + False + True + True + + + True + False + No performers added. + + + + - False + True True 0 - + True - True - True + False + 0 + vertical + 6 - + True - False - edit-symbolic + True + True + + + True + False + list-add-symbolic + + + + False + True + 0 + + + + + True + True + True + + + True + False + edit-symbolic + + + + + False + True + 1 + + + + + True + True + True + + + True + False + list-remove-symbolic + + + + + False + True + 2 + @@ -171,76 +239,26 @@ 1 - - - True - True - True - - - True - False - list-remove-symbolic - - - - - False - True - 2 - - - False - True 1 + + + True + False + Performers + + + 1 + False + + - 1 - - - - - True - False - Performers - - - 1 - False - - - - - - - True - False - Recording - - - Cancel - True - True - True - - - - - Save - True - False - True - True - - - - end + True + True 1 diff --git a/res/ui/section_editor.ui b/res/ui/section_editor.ui index 57a8801..e0a3c57 100644 --- a/res/ui/section_editor.ui +++ b/res/ui/section_editor.ui @@ -1,69 +1,88 @@ - + - - False + + + False True - True - dialog + True + dialog - + True - False - 18 - 12 - 6 + False + vertical - + True - False - end - Title + False + Work section + + + Cancel + True + True + True + + + + + Save + True + True + True + + + + end + 1 + + - 0 - 0 + False + True + 0 - + + True - True - True + False + 18 + 12 + 6 + + + True + False + end + Title + + + 0 + 0 + + + + + True + True + True + + + 1 + 0 + + - 1 - 0 - - - - - - - True - False - Work section - - - Cancel - True - True - True - - - - - Save - True - True - True - - - - end + False + True 1 diff --git a/res/ui/track_editor.ui b/res/ui/track_editor.ui index eac3a38..eb46f4f 100644 --- a/res/ui/track_editor.ui +++ b/res/ui/track_editor.ui @@ -2,64 +2,82 @@ - + + False True 350 200 dialog - + True - True + False + vertical - + True False - none + Track - + + Cancel + True + True + True + + + + + Save + True + True + True + + + + end + 1 + + + + + False + True + 0 + + + + + True + True + + True False - none - - + none + + True False - Select a recording of a work with multiple parts. + none + + + True + False + Select a recording of a work with multiple parts. + + - - - - - - True - False - Track - - - Cancel - True - True - True - - - - - Save - True - True - True - - - end + True + True 1 diff --git a/res/ui/tracks_editor.ui b/res/ui/tracks_editor.ui index 94168aa..f2ff3c0 100644 --- a/res/ui/tracks_editor.ui +++ b/res/ui/tracks_editor.ui @@ -2,54 +2,170 @@ - + + False True 400 300 dialog - - + True False - 18 - 12 - 6 + vertical - + True False - end - Recording + Tracks + + + Save + True + False + True + True + + + + end + + + + + Cancel + True + True + True + + + 1 + + - 0 - 0 + False + True + 0 - + + True - True - True - True + False + 18 + 12 + 6 - + True False - False - crossfade - True + end + Recording + + + 0 + 0 + + + + + True + True + True + True - + True False - start - Select … + False + crossfade + True + + + True + False + start + Select … + + + unselected + + + + + True + False + vertical + + + True + False + start + Work + end + + + + + + False + True + 0 + + + + + True + False + 0.5 + start + Performers + end + + + False + True + 1 + + + + + selected + 1 + + + + + + + 1 + 0 + + + + + True + False + True + 6 + + + True + True + in + + + - unselected + True + True + 0 @@ -57,16 +173,19 @@ True False vertical + 6 - + True - False - start - Work - end - - - + True + True + + + True + False + list-add-symbolic + + False @@ -75,202 +194,101 @@ - + True - False - 0.5 - start - Performers - end + True + True + + + True + False + edit-symbolic + + False True - 1 + 2 + + + + + True + True + True + + + True + False + list-remove-symbolic + + + + + False + True + 3 + + + + + True + True + True + + + True + False + go-down-symbolic + + + + + False + True + end + 4 + + + + + True + True + True + + + True + False + go-up-symbolic + + + + + False + True + end + 5 - selected + False + True 1 - - - - 1 - 0 - - - - - True - False - True - 6 - - - True - True - in - - - - - True - True - 0 - - - - - True - False - vertical - 6 - - - True - True - True - - - True - False - list-add-symbolic - - - - - False - True - 0 - - - - - True - True - True - - - True - False - edit-symbolic - - - - - False - True - 2 - - - - - True - True - True - - - True - False - list-remove-symbolic - - - - - False - True - 3 - - - - - True - True - True - - - True - False - go-down-symbolic - - - - - False - True - end - 4 - - - - - True - True - True - - - True - False - go-up-symbolic - - - - - False - True - end - 5 - - - - - False - True - 1 + 0 + 1 + 2 - 0 - 1 - 2 - - - - - - - True - False - Tracks - - - Save - True - False - True - True - - - - end - - - - - Cancel - True - True - True - - + True + True 1 diff --git a/res/ui/work_editor.ui b/res/ui/work_editor.ui index 0f2a8c8..d377bc4 100644 --- a/res/ui/work_editor.ui +++ b/res/ui/work_editor.ui @@ -1,167 +1,217 @@ - + - - False + + + False True - 500 - 450 - True - dialog + 500 + 450 + True + dialog - + True - True + False + vertical - + True - False - 18 - 12 - 6 + False + Work - + + Cancel True - True - True - True - - - True - False - start - Select … - - + True + True - - 1 - 1 - + + Save + True + False + True + True + + + + end + 1 + + + + + False + True + 0 + + + + + True + True + + + + True + False + 18 + 12 + 6 + + + True + True + True + True + + + True + False + start + Select … + + + + + 1 + 1 + + + + + True + False + end + Composer + + + 0 + 1 + + + + + True + True + + + 1 + 0 + + + + + True + False + end + Title + + + 0 + 0 + + + + + True - False - end - Composer + False + Overview - 0 - 1 - - - - - True - True - - - 1 - 0 - - - - - True - False - end - Title - - - 0 - 0 - - - - - - - True - False - Overview - - - False - - - - - True - False - 18 - 6 - - - True - True - in - - - True - False - - - True - False - True - True - - - True - False - No instruments added. - - - - - - - - - True - True - 0 + False True - False - 0 - vertical + False + 18 6 - + True - True - True + True + in - + True - False - list-add-symbolic + False + + + True + False + True + True + + + True + False + No instruments added. + + + + - False + True True 0 - + True - True - True + False + 0 + vertical + 6 - + True - False - list-remove-symbolic + True + True + + + True + False + list-add-symbolic + + + + False + True + 0 + + + + + True + True + True + + + True + False + list-remove-symbolic + + + + + False + True + 1 + @@ -172,102 +222,180 @@ - False - True 1 - - - 1 - - - - - True - False - Instruments - - - 1 - False - - - - - True - False - 18 - 6 - - + + True - True - in - - - True - False - - - True - False - True - True - - - True - False - No work parts added. - - - - - - + False + Instruments - True - True - 0 + 1 + False True - False - vertical + False + 18 6 - + True - True - True + True + in - + True - False - list-add-symbolic + False + + + True + False + True + True + + + True + False + No work parts added. + + + + - False + True True 0 - + True - True - True + False + vertical + 6 - + True - False - folder-new-symbolic + True + True + + + True + False + list-add-symbolic + + + + False + True + 0 + + + + + True + True + True + + + True + False + folder-new-symbolic + + + + + False + True + 1 + + + + + True + True + True + + + True + False + edit-symbolic + + + + + False + True + 2 + + + + + True + True + True + + + True + False + list-remove-symbolic + + + + + False + True + 3 + + + + + True + True + True + + + True + False + go-down-symbolic + + + + + False + True + end + 4 + + + + + True + True + True + + + True + False + go-up-symbolic + + + + + False + True + end + 5 + @@ -276,135 +404,26 @@ 1 - - - True - True - True - - - True - False - edit-symbolic - - - - - False - True - 2 - - - - - True - True - True - - - True - False - list-remove-symbolic - - - - - False - True - 3 - - - - - True - True - True - - - True - False - go-down-symbolic - - - - - False - True - end - 4 - - - - - True - True - True - - - True - False - go-up-symbolic - - - - - False - True - end - 5 - - - False - True - 1 + 2 + + + + + True + False + Structure + + + 2 + False - 2 - - - - - True - False - Structure - - - 2 - False - - - - - - - True - False - Work - - - Cancel - True - True - True - - - - - Save - True - False - True - True - - - - end + False + True 1 diff --git a/src/dialogs/ensemble_editor.rs b/src/dialogs/ensemble_editor.rs index ca68b1d..84faec6 100644 --- a/src/dialogs/ensemble_editor.rs +++ b/src/dialogs/ensemble_editor.rs @@ -10,7 +10,7 @@ where F: Fn(Ensemble) -> () + 'static, { backend: Rc, - 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); diff --git a/src/dialogs/ensemble_selector.rs b/src/dialogs/ensemble_selector.rs index 39e6913..a96f980 100644 --- a/src/dialogs/ensemble_selector.rs +++ b/src/dialogs/ensemble_selector.rs @@ -14,7 +14,7 @@ where F: Fn(Ensemble) -> () + 'static, { backend: Rc, - 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); diff --git a/src/dialogs/instrument_editor.rs b/src/dialogs/instrument_editor.rs index 104ff16..5a93810 100644 --- a/src/dialogs/instrument_editor.rs +++ b/src/dialogs/instrument_editor.rs @@ -10,7 +10,7 @@ where F: Fn(Instrument) -> () + 'static, { backend: Rc, - 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); diff --git a/src/dialogs/instrument_selector.rs b/src/dialogs/instrument_selector.rs index bc5f07c..9b19895 100644 --- a/src/dialogs/instrument_selector.rs +++ b/src/dialogs/instrument_selector.rs @@ -14,7 +14,7 @@ where F: Fn(Instrument) -> () + 'static, { backend: Rc, - 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); diff --git a/src/dialogs/part_editor.rs b/src/dialogs/part_editor.rs index 37f0e09..bd65edf 100644 --- a/src/dialogs/part_editor.rs +++ b/src/dialogs/part_editor.rs @@ -12,7 +12,7 @@ use std::rc::Rc; pub struct PartEditor { backend: Rc, - window: gtk::Window, + window: libhandy::Window, title_entry: gtk::Entry, composer: RefCell>, composer_label: gtk::Label, @@ -29,7 +29,7 @@ impl PartEditor { ) -> Rc { 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); diff --git a/src/dialogs/performance_editor.rs b/src/dialogs/performance_editor.rs index c7d0d96..6c325e5 100644 --- a/src/dialogs/performance_editor.rs +++ b/src/dialogs/performance_editor.rs @@ -13,7 +13,7 @@ where F: Fn(PerformanceDescription) -> () + 'static, { backend: Rc, - 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); diff --git a/src/dialogs/person_editor.rs b/src/dialogs/person_editor.rs index fec47a4..acb890b 100644 --- a/src/dialogs/person_editor.rs +++ b/src/dialogs/person_editor.rs @@ -10,7 +10,7 @@ where F: Fn(Person) -> () + 'static, { backend: Rc, - window: gtk::Window, + window: libhandy::Window, callback: F, id: i64, first_name_entry: gtk::Entry, @@ -29,7 +29,7 @@ where ) -> Rc { 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); diff --git a/src/dialogs/person_selector.rs b/src/dialogs/person_selector.rs index 6830a01..bcdf165 100644 --- a/src/dialogs/person_selector.rs +++ b/src/dialogs/person_selector.rs @@ -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, 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 |_| { diff --git a/src/dialogs/preferences.rs b/src/dialogs/preferences.rs index ccd3c7d..cc0673a 100644 --- a/src/dialogs/preferences.rs +++ b/src/dialogs/preferences.rs @@ -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>(backend: Rc, 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); diff --git a/src/dialogs/recording_editor.rs b/src/dialogs/recording_editor.rs index fa2ec9b..9b6fce1 100644 --- a/src/dialogs/recording_editor.rs +++ b/src/dialogs/recording_editor.rs @@ -14,7 +14,7 @@ where F: Fn(RecordingDescription) -> () + 'static, { backend: Rc, - 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); diff --git a/src/dialogs/recording_selector.rs b/src/dialogs/recording_selector.rs index 787b599..7852f2b 100644 --- a/src/dialogs/recording_selector.rs +++ b/src/dialogs/recording_selector.rs @@ -14,7 +14,7 @@ use std::rc::Rc; pub struct RecordingSelector { backend: Rc, - window: gtk::Window, + window: libhandy::Window, callback: Box () + 'static>, leaflet: libhandy::Leaflet, navigator: Rc, @@ -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); diff --git a/src/dialogs/section_editor.rs b/src/dialogs/section_editor.rs index 7c94410..78d725a 100644 --- a/src/dialogs/section_editor.rs +++ b/src/dialogs/section_editor.rs @@ -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); diff --git a/src/dialogs/track_editor.rs b/src/dialogs/track_editor.rs index a5148f8..afc87ce 100644 --- a/src/dialogs/track_editor.rs +++ b/src/dialogs/track_editor.rs @@ -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); diff --git a/src/dialogs/tracks_editor.rs b/src/dialogs/tracks_editor.rs index f950212..9cea80a 100644 --- a/src/dialogs/tracks_editor.rs +++ b/src/dialogs/tracks_editor.rs @@ -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); diff --git a/src/dialogs/work_editor.rs b/src/dialogs/work_editor.rs index f1b6e50..53ceaf8 100644 --- a/src/dialogs/work_editor.rs +++ b/src/dialogs/work_editor.rs @@ -54,7 +54,7 @@ pub struct WorkEditor where F: Fn(WorkDescription) -> () + 'static, { backend: Rc, - window: gtk::Window, + window: libhandy::Window, callback: F, save_button: gtk::Button, id: i64, @@ -78,7 +78,7 @@ where ) -> Rc { 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);