Split KDMOutputPanel into TallKDMOutputPanel and a base.

The TallKDMOutputPanel is just responsible for layout out the controls.

1 files changed, 4 insertions, 41 deletions

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index 78186e4cb..3548d4dee 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -66,36 +66,13 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	, _forensic_mark_audio (true)
 	, _forensic_mark_audio_up_to (12)
 {
-	auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
-	table->AddGrowableCol (1);
-
-	add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-
-	auto type = new wxBoxSizer (wxHORIZONTAL);
 	_type = new KDMChoice (this);
-	type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
 	_type->set(Config::instance()->default_kdm_type());
-	auto advanced = new Button (this, _("Advanced..."));
-	type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
-	table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
-
-	add_label_to_sizer(table, this, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+	_advanced = new Button(this, _("Advanced..."));
 	_annotation_text = new wxTextCtrl(this, wxID_ANY);
-	table->Add(_annotation_text, 1, wxEXPAND);
 
-	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);
 
-	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);
-	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"));
@@ -109,10 +86,8 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 	ex['b'] = "2012/03/15 12:30";
 	ex['e'] = "2012/03/22 02:30";
 	_filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml");
-	table->Add (_filename_format->panel(), 1, wxEXPAND);
 
 	_write_to = new CheckBox (this, _("Write to"));
-	table->Add (_write_to, 1, wxEXPAND);
 
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	_folder = new DirPickerCtrl (this);
@@ -127,22 +102,12 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 		_folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
 	}
 
-	table->Add (_folder, 1, wxEXPAND);
-
-	auto 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, 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, 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, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
-	table->AddSpacer (0);
-	table->Add (write_options);
 
 	_email = new CheckBox (this, _("Send by email"));
-	table->Add (_email, 1, wxEXPAND);
-	auto add_email_addresses = new wxButton(this, wxID_ANY, _("Set additional email addresses..."));
-	table->Add (add_email_addresses);
+	_add_email_addresses = new wxButton(this, wxID_ANY, _("Set additional email addresses..."));
 
 	switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) {
 	case Config::KDM_WRITE_FLAT:
@@ -161,13 +126,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent)
 
 	_write_to->bind(&KDMOutputPanel::write_to_changed, this);
 	_email->bind(&KDMOutputPanel::email_changed, this);
-	add_email_addresses->Bind (wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this));
+	_add_email_addresses->Bind(wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this));
 	_write_flat->Bind   (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
 	_write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
 	_write_zip->Bind    (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
-	advanced->Bind      (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this));
-
-	SetSizer (table);
+	_advanced->Bind     (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this));
 }