X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=294fdd4dfb7f803ea12974bd8fba934a517f9f87;hp=d76a2735902d97923466f8ce1bac34b7ad391b1e;hb=3ee5431c7e270d7bf706fcf7530a6eb2c78480c3;hpb=910ea473219f2e7c672ad437d458316deca67025

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index d76a27359..294fdd4df 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -18,10 +18,6 @@
 
 */
 
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/cinema_kdms.h"
-#include "lib/send_kdm_email_job.h"
 #include "kdm_output_panel.h"
 #include "kdm_timing_panel.h"
 #include "confirm_kdm_email_dialog.h"
@@ -30,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;
@@ -54,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);
@@ -112,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);
 
@@ -183,10 +188,10 @@ KDMOutputPanel::kdm_write_type_changed ()
 
 pair<shared_ptr<Job>, int>
 KDMOutputPanel::make (
-	list<shared_ptr<ScreenKDM> > screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
+	list<KDMWithMetadataPtr> kdms, string name, function<bool (boost::filesystem::path)> confirm_overwrite
 	)
 {
-	list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
+	list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms);
 
 	/* Decide whether to proceed */
 
@@ -200,8 +205,8 @@ KDMOutputPanel::make (
 		}
 
 		bool cinemas_with_no_email = false;
-		BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
-			if (i.cinema->emails.empty ()) {
+		BOOST_FOREACH (list<KDMWithMetadataPtr> i, cinema_kdms) {
+			if (i.front()->emails().empty()) {
 				cinemas_with_no_email = true;
 			}
 		}
@@ -215,8 +220,8 @@ KDMOutputPanel::make (
 
 		if (proceed && Config::instance()->confirm_kdm_email ()) {
 			list<string> emails;
-			BOOST_FOREACH (CinemaKDMs i, cinema_kdms) {
-				BOOST_FOREACH (string j, i.cinema->emails) {
+			BOOST_FOREACH (list<KDMWithMetadataPtr> const& i, cinema_kdms) {
+				BOOST_FOREACH (string j, i.front()->emails()) {
 					emails.push_back (j);
 				}
 			}
@@ -240,36 +245,29 @@ KDMOutputPanel::make (
 	shared_ptr<Job> job;
 
 	try {
-		dcp::NameFormat::Map name_values;
-		name_values['f'] = name;
-		name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(false, false);
-		name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(false, false);
 
 		if (_write_to->GetValue()) {
 			if (_write_flat->GetValue()) {
-				written = ScreenKDM::write_files (
-					screen_kdms,
+				written = write_files (
+					kdms,
 					directory(),
 					_filename_format->get(),
-					name_values,
 					confirm_overwrite
 					);
 			} else if (_write_folder->GetValue()) {
-				written = CinemaKDMs::write_directories (
-					CinemaKDMs::collect (screen_kdms),
+				written = write_directories (
+					collect (kdms),
 					directory(),
 					_container_name_format->get(),
 					_filename_format->get(),
-					name_values,
 					confirm_overwrite
 					);
 			} else if (_write_zip->GetValue()) {
-				written = CinemaKDMs::write_zip_files (
-					CinemaKDMs::collect (screen_kdms),
+				written = write_zip_files (
+					collect (kdms),
 					directory(),
 					_container_name_format->get(),
 					_filename_format->get(),
-					name_values,
 					confirm_overwrite
 					);
 			}
@@ -281,7 +279,6 @@ KDMOutputPanel::make (
 					cinema_kdms,
 					_container_name_format->get(),
 					_filename_format->get(),
-					name_values,
 					name
 					)
 				);