X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=6aa0d878f668ba4d45ea7a02abaa34d365e435de;hb=e9ae050b0b15c91c3f591ad84938e60d271357b3;hp=8c7f4007ba3576fec18b79dc341c40c8842f1fa9;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 8c7f4007b..6aa0d878f 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -49,13 +49,13 @@ using std::list;
 using std::exception;
 using std::make_pair;
 using std::shared_ptr;
-using boost::function;
+using std::function;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 
 
-KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
+KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	: wxPanel (parent, wxID_ANY)
 	, _forensic_mark_video (true)
 	, _forensic_mark_audio (true)
@@ -69,23 +69,29 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
 	wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL);
 	_type = new wxChoice (this, wxID_ANY);
 	_type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1));
+	_type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
+	_type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
 	_type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1));
 	_type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST));
-	if (!interop) {
-		_type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
-		_type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
-	}
-	type->Add (_type, 1, wxEXPAND);
+	type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
 	_type->SetSelection (0);
 	wxButton* advanced = new Button (this, _("Advanced..."));
 	type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-	table->Add (type, 1, wxEXPAND);
+	table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
 
-	add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
+	add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
 	_container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), "");
 	table->Add (_container_name_format->panel(), 1, wxEXPAND);
 
-	add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
+	auto format = create_label (this, _("Filename format"), true);
+	auto align = new wxBoxSizer (wxHORIZONTAL);
+#ifdef DCPOMATIC_OSX
+	align->Add (format, 0, wxTOP, 2);
+	table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2);
+#else
+	align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP - 2);
+	table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
+#endif
 	dcp::NameFormat::Map titles;
 	titles['f'] = wx_to_std (_("film name"));
 	titles['c'] = wx_to_std (_("cinema"));