Merge work selector and editor to single dialog

po/POTFILES.in

@@ -24,6 +24,7 @@ res/ui/window.ui
 res/ui/work_editor.ui
 res/ui/work_screen.ui
 res/ui/work_selector.ui
+res/ui/work_selector_screen.ui
 
 src/database/database.rs
 src/database/models.rs
@@ -36,7 +37,6 @@ src/dialogs/ensemble_selector.rs
 src/dialogs/instrument_editor.rs
 src/dialogs/instrument_selector.rs
 src/dialogs/mod.rs
-src/dialogs/part_editor.rs
 src/dialogs/person_editor.rs
 src/dialogs/person_selector.rs
 src/dialogs/preferences.rs
@@ -48,11 +48,16 @@ src/dialogs/recording/recording_editor.rs
 src/dialogs/recording/recording_selector_person_screen.rs
 src/dialogs/recording/recording_selector.rs
 src/dialogs/recording/recording_selector_work_screen.rs
-src/dialogs/section_editor.rs
 src/dialogs/track_editor.rs
 src/dialogs/tracks_editor.rs
-src/dialogs/work_editor.rs
-src/dialogs/work_selector.rs
+src/dialogs/work/mod.rs
+src/dialogs/work/part_editor.rs
+src/dialogs/work/section_editor.rs
+src/dialogs/work/work_dialog.rs
+src/dialogs/work/work_editor_dialog.rs
+src/dialogs/work/work_editor.rs
+src/dialogs/work/work_selector_person_screen.rs
+src/dialogs/work/work_selector.rs
 src/screens/ensemble_screen.rs
 src/screens/mod.rs
 src/screens/person_screen.rs

po/de.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-08 12:11+0100\n"
-"PO-Revision-Date: 2020-11-08 02:37+0100\n"
+"POT-Creation-Date: 2020-11-08 20:12+0100\n"
+"PO-Revision-Date: 2020-11-08 20:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -27,7 +27,7 @@ msgstr "Ensemble"
 #: res/ui/part_editor.ui:25 res/ui/performance_editor.ui:23
 #: res/ui/person_editor.ui:23 res/ui/recording_editor.ui:17
 #: res/ui/section_editor.ui:23 res/ui/track_editor.ui:24
-#: res/ui/tracks_editor.ui:39 res/ui/work_editor.ui:25
+#: res/ui/tracks_editor.ui:39 res/ui/work_editor.ui:17
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -35,7 +35,7 @@ msgstr "Abbrechen"
 #: res/ui/part_editor.ui:33 res/ui/performance_editor.ui:31
 #: res/ui/person_editor.ui:31 res/ui/recording_editor.ui:25
 #: res/ui/section_editor.ui:31 res/ui/track_editor.ui:32
-#: res/ui/tracks_editor.ui:24 res/ui/work_editor.ui:33
+#: res/ui/tracks_editor.ui:24 res/ui/work_editor.ui:25
 msgid "Save"
 msgstr "Speichern"
 
@@ -83,36 +83,32 @@ msgstr "Keine Instrumente gefunden."
 msgid "Work part"
 msgstr "Werkabschnitt"
 
-#: res/ui/part_editor.ui:70 res/ui/work_editor.ui:91
+#: res/ui/part_editor.ui:70 res/ui/work_editor.ui:84
 msgid "Composer"
 msgstr "Komponist"
 
 #: res/ui/part_editor.ui:93 res/ui/player_bar.ui:118
 #: res/ui/player_screen.ui:160 res/ui/section_editor.ui:64
-#: res/ui/work_editor.ui:113
+#: res/ui/work_editor.ui:106
 msgid "Title"
 msgstr "Titel"
 
 #: res/ui/part_editor.ui:116 res/ui/performance_editor.ui:87
 #: res/ui/performance_editor.ui:170 res/ui/performance_editor.ui:214
 #: res/ui/recording_editor.ui:81 res/ui/tracks_editor.ui:93
-#: res/ui/work_editor.ui:77 src/dialogs/part_editor.rs:99
-#: src/dialogs/recording/performance_editor.rs:150
+#: res/ui/work_editor.ui:69 src/dialogs/recording/performance_editor.rs:150
 #: src/dialogs/recording/performance_editor.rs:160
 #: src/dialogs/recording/performance_editor.rs:170
+#: src/dialogs/work/part_editor.rs:166
 msgid "Select …"
 msgstr "Auswählen …"
 
-#: res/ui/part_editor.ui:160 res/ui/recording_editor.ui:119
-#: res/ui/work_editor.ui:126
+#: res/ui/part_editor.ui:159 res/ui/recording_editor.ui:119
+#: res/ui/work_editor.ui:119
 msgid "Overview"
 msgstr "Überblick"
 
-#: res/ui/part_editor.ui:191 res/ui/work_editor.ui:157
-msgid "No instruments added."
-msgstr "Keine Instrumente hinzugefügt."
-
-#: res/ui/part_editor.ui:266 res/ui/work_editor.ui:232
+#: res/ui/part_editor.ui:247 res/ui/work_editor.ui:207
 msgid "Instruments"
 msgstr "Instrumente"
 
@@ -141,7 +137,7 @@ msgstr "Vorname"
 msgid "Last name"
 msgstr "Nachname"
 
-#: res/ui/person_list.ui:28 res/ui/work_selector.ui:69
+#: res/ui/person_list.ui:28
 msgid "Search persons …"
 msgstr "Personen durchsuchen …"
 
@@ -211,7 +207,7 @@ msgid "Comment"
 msgstr "Kommentar"
 
 #: res/ui/recording_editor.ui:106 res/ui/tracks_editor.ui:109
-#: res/ui/work_editor.ui:22
+#: res/ui/work_editor.ui:14
 msgid "Work"
 msgstr "Werk"
 
@@ -227,7 +223,7 @@ msgstr "Tracks"
 msgid "Add to playlist"
 msgstr "Zur Wiedergabeliste hinzufügen"
 
-#: res/ui/recording_selector.ui:27 res/ui/work_selector.ui:180
+#: res/ui/recording_selector.ui:27 res/ui/work_selector.ui:26
 msgid "Select a composer on the left."
 msgstr "Wählen Sie einen Komponisten aus."
 
@@ -284,26 +280,14 @@ msgstr "Einstellungen"
 msgid "About Musicus"
 msgstr "Über Musicus"
 
-#: res/ui/work_editor.ui:264
-msgid "No work parts added."
-msgstr "Keine Werkabschnitte hinzugefügt."
-
-#: res/ui/work_editor.ui:416
+#: res/ui/work_editor.ui:373
 msgid "Structure"
 msgstr "Struktur"
 
-#: res/ui/work_selector.ui:113 src/widgets/person_list.rs:26
-msgid "No persons found."
-msgstr "Keine Personen gefunden."
-
-#: res/ui/work_selector.ui:167
-msgid "Select work"
+#: res/ui/work_selector.ui:51
+msgid "Select a work"
 msgstr "Werk auswählen"
 
-#: res/ui/work_selector.ui:268
-msgid "Search works …"
-msgstr "Werke durchsuchen …"
-
 #: src/dialogs/about.rs:12
 msgid "The classical music player and organizer."
 msgstr "Das Programm zum Abspielen und Organisieren von Klassik."
@@ -321,6 +305,7 @@ msgid "No performers added."
 msgstr "Keine Interpreten hinzugefügt."
 
 #: src/dialogs/recording/recording_selector_person_screen.rs:39
+#: src/dialogs/work/work_selector_person_screen.rs:36
 #: src/screens/person_screen.rs:57
 msgid "No works found."
 msgstr "Keine Werke gefunden."
@@ -338,6 +323,14 @@ msgstr "Audiodateien auswählen"
 msgid "Unknown"
 msgstr "Unbekannt"
 
+#: src/dialogs/work/part_editor.rs:49 src/dialogs/work/work_editor.rs:69
+msgid "No instruments added."
+msgstr "Keine Instrumente hinzugefügt."
+
+#: src/dialogs/work/work_editor.rs:72
+msgid "No work parts added."
+msgstr "Keine Werkabschnitte hinzugefügt."
+
 #: src/screens/ensemble_screen.rs:35
 msgid "Edit ensemble"
 msgstr "Ensemble bearbeiten"
@@ -382,6 +375,13 @@ msgstr "Werk bearbeiten"
 msgid "Delete work"
 msgstr "Werk löschen"
 
+#: src/widgets/person_list.rs:26
+msgid "No persons found."
+msgstr "Keine Personen gefunden."
+
 #: src/widgets/poe_list.rs:41
 msgid "No persons or ensembles found."
 msgstr "Keine Personen oder Ensembles gefunden."
+
+#~ msgid "Search works …"
+#~ msgstr "Werke durchsuchen …"

po/musicus.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: musicus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-08 12:11+0100\n"
+"POT-Creation-Date: 2020-11-08 20:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 #: res/ui/part_editor.ui:25 res/ui/performance_editor.ui:23
 #: res/ui/person_editor.ui:23 res/ui/recording_editor.ui:17
 #: res/ui/section_editor.ui:23 res/ui/track_editor.ui:24
-#: res/ui/tracks_editor.ui:39 res/ui/work_editor.ui:25
+#: res/ui/tracks_editor.ui:39 res/ui/work_editor.ui:17
 msgid "Cancel"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 #: res/ui/part_editor.ui:33 res/ui/performance_editor.ui:31
 #: res/ui/person_editor.ui:31 res/ui/recording_editor.ui:25
 #: res/ui/section_editor.ui:31 res/ui/track_editor.ui:32
-#: res/ui/tracks_editor.ui:24 res/ui/work_editor.ui:33
+#: res/ui/tracks_editor.ui:24 res/ui/work_editor.ui:25
 msgid "Save"
 msgstr ""
 
@@ -82,36 +82,32 @@ msgstr ""
 msgid "Work part"
 msgstr ""
 
-#: res/ui/part_editor.ui:70 res/ui/work_editor.ui:91
+#: res/ui/part_editor.ui:70 res/ui/work_editor.ui:84
 msgid "Composer"
 msgstr ""
 
 #: res/ui/part_editor.ui:93 res/ui/player_bar.ui:118
 #: res/ui/player_screen.ui:160 res/ui/section_editor.ui:64
-#: res/ui/work_editor.ui:113
+#: res/ui/work_editor.ui:106
 msgid "Title"
 msgstr ""
 
 #: res/ui/part_editor.ui:116 res/ui/performance_editor.ui:87
 #: res/ui/performance_editor.ui:170 res/ui/performance_editor.ui:214
 #: res/ui/recording_editor.ui:81 res/ui/tracks_editor.ui:93
-#: res/ui/work_editor.ui:77 src/dialogs/part_editor.rs:99
-#: src/dialogs/recording/performance_editor.rs:150
+#: res/ui/work_editor.ui:69 src/dialogs/recording/performance_editor.rs:150
 #: src/dialogs/recording/performance_editor.rs:160
 #: src/dialogs/recording/performance_editor.rs:170
+#: src/dialogs/work/part_editor.rs:166
 msgid "Select …"
 msgstr ""
 
-#: res/ui/part_editor.ui:160 res/ui/recording_editor.ui:119
-#: res/ui/work_editor.ui:126
+#: res/ui/part_editor.ui:159 res/ui/recording_editor.ui:119
+#: res/ui/work_editor.ui:119
 msgid "Overview"
 msgstr ""
 
-#: res/ui/part_editor.ui:191 res/ui/work_editor.ui:157
-msgid "No instruments added."
-msgstr ""
-
-#: res/ui/part_editor.ui:266 res/ui/work_editor.ui:232
+#: res/ui/part_editor.ui:247 res/ui/work_editor.ui:207
 msgid "Instruments"
 msgstr ""
 
@@ -140,7 +136,7 @@ msgstr ""
 msgid "Last name"
 msgstr ""
 
-#: res/ui/person_list.ui:28 res/ui/work_selector.ui:69
+#: res/ui/person_list.ui:28
 msgid "Search persons …"
 msgstr ""
 
@@ -210,7 +206,7 @@ msgid "Comment"
 msgstr ""
 
 #: res/ui/recording_editor.ui:106 res/ui/tracks_editor.ui:109
-#: res/ui/work_editor.ui:22
+#: res/ui/work_editor.ui:14
 msgid "Work"
 msgstr ""
 
@@ -226,7 +222,7 @@ msgstr ""
 msgid "Add to playlist"
 msgstr ""
 
-#: res/ui/recording_selector.ui:27 res/ui/work_selector.ui:180
+#: res/ui/recording_selector.ui:27 res/ui/work_selector.ui:26
 msgid "Select a composer on the left."
 msgstr ""
 
@@ -278,24 +274,12 @@ msgstr ""
 msgid "About Musicus"
 msgstr ""
 
-#: res/ui/work_editor.ui:264
-msgid "No work parts added."
-msgstr ""
-
-#: res/ui/work_editor.ui:416
+#: res/ui/work_editor.ui:373
 msgid "Structure"
 msgstr ""
 
-#: res/ui/work_selector.ui:113 src/widgets/person_list.rs:26
-msgid "No persons found."
-msgstr ""
-
-#: res/ui/work_selector.ui:167
-msgid "Select work"
-msgstr ""
-
-#: res/ui/work_selector.ui:268
-msgid "Search works …"
+#: res/ui/work_selector.ui:51
+msgid "Select a work"
 msgstr ""
 
 #: src/dialogs/about.rs:12
@@ -315,6 +299,7 @@ msgid "No performers added."
 msgstr ""
 
 #: src/dialogs/recording/recording_selector_person_screen.rs:39
+#: src/dialogs/work/work_selector_person_screen.rs:36
 #: src/screens/person_screen.rs:57
 msgid "No works found."
 msgstr ""
@@ -332,6 +317,14 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
+#: src/dialogs/work/part_editor.rs:49 src/dialogs/work/work_editor.rs:69
+msgid "No instruments added."
+msgstr ""
+
+#: src/dialogs/work/work_editor.rs:72
+msgid "No work parts added."
+msgstr ""
+
 #: src/screens/ensemble_screen.rs:35
 msgid "Edit ensemble"
 msgstr ""
@@ -376,6 +369,10 @@ msgstr ""
 msgid "Delete work"
 msgstr ""
 
+#: src/widgets/person_list.rs:26
+msgid "No persons found."
+msgstr ""
+
 #: src/widgets/poe_list.rs:41
 msgid "No persons or ensembles found."
 msgstr ""