From c7928003e4c214bf58d3fa1a69582c42ef33c83c Mon Sep 17 00:00:00 2001 From: Elias Projahn Date: Wed, 13 Jan 2021 16:12:22 +0100 Subject: [PATCH] Add UI resources for new dialogs --- musicus/res/musicus.gresource.xml | 7 +- musicus/res/ui/import_dialog.ui | 65 ++++ ...older_dialg.ui => import_folder_dialog.ui} | 46 +-- musicus/res/ui/track_editor.ui | 67 +--- musicus/res/ui/track_selector.ui | 75 +++++ musicus/res/ui/track_set_editor.ui | 153 +++++++++ musicus/res/ui/tracks_editor.ui | 311 ------------------ 7 files changed, 310 insertions(+), 414 deletions(-) create mode 100644 musicus/res/ui/import_dialog.ui rename musicus/res/ui/{import_folder_dialg.ui => import_folder_dialog.ui} (60%) create mode 100644 musicus/res/ui/track_selector.ui create mode 100644 musicus/res/ui/track_set_editor.ui delete mode 100644 musicus/res/ui/tracks_editor.ui diff --git a/musicus/res/musicus.gresource.xml b/musicus/res/musicus.gresource.xml index 4ab573a..4e94aea 100644 --- a/musicus/res/musicus.gresource.xml +++ b/musicus/res/musicus.gresource.xml @@ -4,11 +4,9 @@ ui/ensemble_editor.ui ui/ensemble_screen.ui ui/ensemble_selector.ui + ui/import_dialog.ui ui/import_disc_dialog.ui -<<<<<<< HEAD ui/import_folder_dialog.ui -======= ->>>>>>> wip/cd-ripping-old ui/instrument_editor.ui ui/instrument_selector.ui ui/login_dialog.ui @@ -27,8 +25,9 @@ ui/recording_selector_screen.ui ui/selector.ui ui/server_dialog.ui - ui/tracks_editor.ui ui/track_editor.ui + ui/track_selector.ui + ui/track_set_editor.ui ui/window.ui ui/work_editor.ui ui/work_part_editor.ui diff --git a/musicus/res/ui/import_dialog.ui b/musicus/res/ui/import_dialog.ui new file mode 100644 index 0000000..615b733 --- /dev/null +++ b/musicus/res/ui/import_dialog.ui @@ -0,0 +1,65 @@ + + + + + + True + vertical + + + True + Import music + + + True + True + + + True + go-previous-symbolic + + + + + + + True + True + + + True + list-add-symbolic + + + + + end + + + + + + + True + True + True + + + True + + + True + start + in + 12 + 6 + 6 + 6 + + + + + + + + diff --git a/musicus/res/ui/import_folder_dialg.ui b/musicus/res/ui/import_folder_dialog.ui similarity index 60% rename from musicus/res/ui/import_folder_dialg.ui rename to musicus/res/ui/import_folder_dialog.ui index 6d38f09..1b1ea91 100644 --- a/musicus/res/ui/import_folder_dialg.ui +++ b/musicus/res/ui/import_folder_dialog.ui @@ -1,42 +1,31 @@ - True - False vertical True - False Import folder True True - True True - False go-previous-symbolic - - False - True - 0 - True - False center center True @@ -46,72 +35,43 @@ True - False - 0.50196078431372548 + 0.5 80 folder-symbolic - - False - True - 0 - True - False - 0.50196078431372548 + 0.5 Import from a folder - - False - True - 1 - True - False - 0.50196078431372548 + 0.5 Select a folder containing audio files with the button below. After adding the metdata in the next step, the folder will be copied to your music library. center True 40 - - False - True - 2 - Select True True - True center - - False - True - 3 - - - False - True - 1 - diff --git a/musicus/res/ui/track_editor.ui b/musicus/res/ui/track_editor.ui index 592b1af..9657d7d 100644 --- a/musicus/res/ui/track_editor.ui +++ b/musicus/res/ui/track_editor.ui @@ -1,107 +1,67 @@ - - + True - False vertical True - False Track True True - True True - False go-previous-symbolic - + True True - True - - - True - False - object-select-symbolic - - + + + True + object-select-symbolic + + end - 1 - - False - True - 0 - True True + True True - False none True - False - 500 - 300 - + True - False start + 12 6 6 - 12 6 - 0 in - - - True - False - none - - - True - False - 6 - 6 - 6 - 6 - Select a recording of a work with multiple parts. - end - - - - - - - @@ -109,11 +69,6 @@ - - True - True - 1 - diff --git a/musicus/res/ui/track_selector.ui b/musicus/res/ui/track_selector.ui new file mode 100644 index 0000000..9654441 --- /dev/null +++ b/musicus/res/ui/track_selector.ui @@ -0,0 +1,75 @@ + + + + + + True + vertical + + + True + Select tracks + + + True + True + + + True + go-previous-symbolic + + + + + + + True + True + False + + + + True + object-select-symbolic + + + + + end + + + + + + + True + True + True + + + True + none + + + True + + + True + start + 12 + 6 + 6 + 6 + in + + + + + + + + + + diff --git a/musicus/res/ui/track_set_editor.ui b/musicus/res/ui/track_set_editor.ui new file mode 100644 index 0000000..95f0c1a --- /dev/null +++ b/musicus/res/ui/track_set_editor.ui @@ -0,0 +1,153 @@ + + + + + + True + vertical + + + True + Tracks + + + True + True + + + True + go-previous-symbolic + + + + + + + True + True + False + + + + True + object-select-symbolic + + + + + end + + + + + + + True + True + True + + + True + none + + + True + + + True + 6 + 6 + 6 + vertical + + + True + start + 12 + 6 + Recording + + + + + + + + True + in + + + True + none + + + True + True + True + Select a recording + select_recording_button + + + Select + True + True + center + + + + + + + + + + + True + horizontal + 12 + 6 + + + True + start + end + True + Tracks + + + + + + + + True + True + none + + + True + document-edit-symbolic + + + + + + + + + True + in + + + + + + + + + + + + diff --git a/musicus/res/ui/tracks_editor.ui b/musicus/res/ui/tracks_editor.ui deleted file mode 100644 index 4a23e84..0000000 --- a/musicus/res/ui/tracks_editor.ui +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - True - False - vertical - - - True - False - Tracks - - - True - False - True - True - - - True - False - object-select-symbolic - - - - - - end - - - - - True - True - True - - - True - False - go-previous-symbolic - - - - - 1 - - - - - False - True - 0 - - - - - True - False - True - 800 - 300 - - - - True - False - True - 18 - 12 - 6 - - - True - False - end - Recording - - - 0 - 0 - - - - - True - True - True - True - - - True - False - 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 - - - - - - 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 - - - - - - - False - True - 1 - - - -