X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fkdm_output_panel.cc;h=294fdd4dfb7f803ea12974bd8fba934a517f9f87;hb=3ee5431c7e270d7bf706fcf7530a6eb2c78480c3;hp=0a70ff125bdb10e9b0a01e22f319a81abfcd81a2;hpb=5579acd7ff7e1460f0b5bb54a4deedbd356153cd;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 0a70ff125..294fdd4df 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -18,9 +18,6 @@
 
 */
 
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/send_kdm_email_job.h"
 #include "kdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -29,14 +26,22 @@
 #include "name_format_editor.h"
 #include "check_box.h"
 #include "dcpomatic_button.h"
+#include "lib/config.h"
+#include "lib/cinema.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <dcp/types.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
 #endif
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 using std::pair;
 using std::string;
@@ -53,8 +58,9 @@ 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);
+	add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 
 	wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
 	_type = new wxChoice (this, wxID_ANY);
@@ -111,11 +117,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 
 	wxSizer* write_options = new wxBoxSizer(wxVERTICAL);
 	_write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
-	write_options->Add (_write_flat);
+	write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	_write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs"));
-	write_options->Add (_write_folder);
+	write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	_write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs"));
-	write_options->Add (_write_zip);
+	write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 	table->AddSpacer (0);
 	table->Add (write_options);
 
@@ -200,7 +206,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 +221,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);
 				}
 			}
@@ -239,7 +245,6 @@ KDMOutputPanel::make (
 	shared_ptr<Job> job;
 
 	try {
-		dcp::NameFormat::Map name_values;
 
 		if (_write_to->GetValue()) {
 			if (_write_flat->GetValue()) {
@@ -247,7 +252,6 @@ KDMOutputPanel::make (
 					kdms,
 					directory(),
 					_filename_format->get(),
-					name_values,
 					confirm_overwrite
 					);
 			} else if (_write_folder->GetValue()) {
@@ -256,7 +260,6 @@ KDMOutputPanel::make (
 					directory(),
 					_container_name_format->get(),
 					_filename_format->get(),
-					name_values,
 					confirm_overwrite
 					);
 			} else if (_write_zip->GetValue()) {
@@ -265,7 +268,6 @@ KDMOutputPanel::make (
 					directory(),
 					_container_name_format->get(),
 					_filename_format->get(),
-					name_values,
 					confirm_overwrite
 					);
 			}
@@ -277,7 +279,6 @@ KDMOutputPanel::make (
 					cinema_kdms,
 					_container_name_format->get(),
 					_filename_format->get(),
-					name_values,
 					name
 					)
 				);