Add a 'Make DKDM' dialogue box to simplify and (hopefully) clarify DKDM creation (#1637).

6 files changed, 62 insertions, 46 deletions

diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index ff5d1faf6..31e6ebe79 100644
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -83,37 +83,8 @@ CinemaDialog::CinemaDialog (wxWindow* parent, wxString title, string name, list<
 		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
 	}
 
-	_offsets.push_back (Offset (_("UTC-11"),  -11,  0));
-	_offsets.push_back (Offset (_("UTC-10"),  -10,  0));
-	_offsets.push_back (Offset (_("UTC-9"),    -9,  0));
-	_offsets.push_back (Offset (_("UTC-8"),    -8,  0));
-	_offsets.push_back (Offset (_("UTC-7"),    -7,  0));
-	_offsets.push_back (Offset (_("UTC-6"),    -6,  0));
-	_offsets.push_back (Offset (_("UTC-5"),    -5,  0));
-	_offsets.push_back (Offset (_("UTC-4:30"), -4, 30));
-	_offsets.push_back (Offset (_("UTC-4"),    -4,  0));
-	_offsets.push_back (Offset (_("UTC-3:30"), -3, 30));
-	_offsets.push_back (Offset (_("UTC-3"),    -3,  0));
-	_offsets.push_back (Offset (_("UTC-2"),    -2,  0));
-	_offsets.push_back (Offset (_("UTC-1"),    -1,  0));
-	_offsets.push_back (Offset (_("UTC")  ,     0,  0));
-	_offsets.push_back (Offset (_("UTC+1"),     1,  0));
-	_offsets.push_back (Offset (_("UTC+2"),     2,  0));
-	_offsets.push_back (Offset (_("UTC+3"),     3,  0));
-	_offsets.push_back (Offset (_("UTC+4"),     4,  0));
-	_offsets.push_back (Offset (_("UTC+5"),     5,  0));
-	_offsets.push_back (Offset (_("UTC+5:30"),  5, 30));
-	_offsets.push_back (Offset (_("UTC+6"),     6,  0));
-	_offsets.push_back (Offset (_("UTC+7"),     7,  0));
-	_offsets.push_back (Offset (_("UTC+8"),     8,  0));
-	_offsets.push_back (Offset (_("UTC+9"),     9,  0));
-	_offsets.push_back (Offset (_("UTC+9:30"),  9, 30));
-	_offsets.push_back (Offset (_("UTC+10"),   10,  0));
-	_offsets.push_back (Offset (_("UTC+11"),   11,  0));
-	_offsets.push_back (Offset (_("UTC+12"),   12,  0));
-
 	/* Default to UTC */
-	size_t sel = 13;
+	size_t sel = get_offsets (_offsets);
 	for (size_t i = 0; i < _offsets.size(); ++i) {
 		_utc_offset->Append (_offsets[i].name);
 		if (_offsets[i].hour == utc_offset_hour && _offsets[i].minute == utc_offset_minute) {
diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index 9cb0a65dc..d16b0ba9c 100644
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.h
@@ -53,19 +53,5 @@ private:
 	EditableList<std::string, EmailDialog>* _email_list;
 	std::vector<std::string> _emails;
 	wxChoice* _utc_offset;
-
-	struct Offset
-	{
-		Offset (wxString n, int h, int m)
-			: name (n)
-			, hour (h)
-			, minute (m)
-		{}
-
-		wxString name;
-		int hour;
-		int minute;
-	};
-
 	std::vector<Offset> _offsets;
 };
diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index f37865b94..a345d0e96 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -53,6 +53,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	, _forensic_mark_audio_up_to (12)
 {
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
+	table->AddGrowableCol (1);
 
 	add_label_to_sizer (table, this, _("KDM type"), true);
 
@@ -200,7 +201,7 @@ KDMOutputPanel::make (
 
 		bool cinemas_with_no_email = false;
 		BOOST_FOREACH (list<KDMWithMetadataPtr> i, cinema_kdms) {
-			if (i.front()->cinema()->emails.empty ()) {
+			if (i.front()->emails().empty()) {
 				cinemas_with_no_email = true;
 			}
 		}
@@ -215,7 +216,7 @@ KDMOutputPanel::make (
 		if (proceed && Config::instance()->confirm_kdm_email ()) {
 			list<string> emails;
 			BOOST_FOREACH (list<KDMWithMetadataPtr> const& i, cinema_kdms) {
-				BOOST_FOREACH (string j, i.front()->cinema()->emails) {
+				BOOST_FOREACH (string j, i.front()->emails()) {
 					emails.push_back (j);
 				}
 			}
diff --git a/src/wx/wscript b/src/wx/wscript
index f78a8c617..22d9f0db6 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -52,12 +52,14 @@ sources = """
           dcp_panel.cc
           dcpomatic_button.cc
           disk_warning_dialog.cc
+          dkdm_output_panel.cc
           drive_wipe_warning_dialog.cc
           email_dialog.cc
           image_sequence_dialog.cc
           isdcf_metadata_dialog.cc
           dcp_text_track_dialog.cc
           dir_picker_ctrl.cc
+          dkdm_dialog.cc
           dolby_doremi_certificate_panel.cc
           download_certificate_dialog.cc
           download_certificate_panel.cc
@@ -110,6 +112,8 @@ sources = """
           question_dialog.cc
           rating_dialog.cc
           qube_certificate_panel.cc
+          recipients_panel.cc
+          recipient_dialog.cc
           recreate_chain_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 28f79431a..6eef0d147 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -530,3 +530,40 @@ display_progress (wxString title, wxString task)
 
 	return ok;
 }
+
+
+int
+get_offsets (vector<Offset>& offsets)
+{
+	offsets.push_back (Offset(_("UTC-11"),  -11,  0));
+	offsets.push_back (Offset(_("UTC-10"),  -10,  0));
+	offsets.push_back (Offset(_("UTC-9"),    -9,  0));
+	offsets.push_back (Offset(_("UTC-8"),    -8,  0));
+	offsets.push_back (Offset(_("UTC-7"),    -7,  0));
+	offsets.push_back (Offset(_("UTC-6"),    -6,  0));
+	offsets.push_back (Offset(_("UTC-5"),    -5,  0));
+	offsets.push_back (Offset(_("UTC-4:30"), -4, 30));
+	offsets.push_back (Offset(_("UTC-4"),    -4,  0));
+	offsets.push_back (Offset(_("UTC-3:30"), -3, 30));
+	offsets.push_back (Offset(_("UTC-3"),    -3,  0));
+	offsets.push_back (Offset(_("UTC-2"),    -2,  0));
+	offsets.push_back (Offset(_("UTC-1"),    -1,  0));
+	int utc = offsets.size();
+	offsets.push_back (Offset(_("UTC")  ,     0,  0));
+	offsets.push_back (Offset(_("UTC+1"),     1,  0));
+	offsets.push_back (Offset(_("UTC+2"),     2,  0));
+	offsets.push_back (Offset(_("UTC+3"),     3,  0));
+	offsets.push_back (Offset(_("UTC+4"),     4,  0));
+	offsets.push_back (Offset(_("UTC+5"),     5,  0));
+	offsets.push_back (Offset(_("UTC+5:30"),  5, 30));
+	offsets.push_back (Offset(_("UTC+6"),     6,  0));
+	offsets.push_back (Offset(_("UTC+7"),     7,  0));
+	offsets.push_back (Offset(_("UTC+8"),     8,  0));
+	offsets.push_back (Offset(_("UTC+9"),     9,  0));
+	offsets.push_back (Offset(_("UTC+9:30"),  9, 30));
+	offsets.push_back (Offset(_("UTC+10"),   10,  0));
+	offsets.push_back (Offset(_("UTC+11"),   11,  0));
+	offsets.push_back (Offset(_("UTC+12"),   12,  0));
+
+	return utc;
+}
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index af25ce0f5..8e0befba9 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -88,6 +88,23 @@ extern double calculate_mark_interval (double start);
 extern bool display_progress (wxString title, wxString task);
 extern bool report_errors_from_last_job (wxWindow* parent);
 
+
+struct Offset
+{
+	Offset (wxString n, int h, int m)
+		: name (n)
+		, hour (h)
+		, minute (m)
+	{}
+
+	wxString name;
+	int hour;
+	int minute;
+};
+
+extern int get_offsets (std::vector<Offset>& offsets);
+
+
 extern void checked_set (FilePickerCtrl* widget, boost::filesystem::path value);
 extern void checked_set (wxDirPickerCtrl* widget, boost::filesystem::path value);
 extern void checked_set (wxSpinCtrl* widget, int value);