X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fself_dkdm_dialog.cc;h=c8587e7ee83a8620d99e5539457b89c00fe25f92;hb=0062a0ad4e8bde2866cd42404ea103ed29fa59db;hp=001b8d328c06e1b3156787c3d106f5ce009af851;hpb=a9f81397b720819af7cb4aee4307e5888752a9ef;p=dcpomatic.git

diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc
index 001b8d328..c8587e7ee 100644
--- a/src/wx/self_dkdm_dialog.cc
+++ b/src/wx/self_dkdm_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,23 +18,32 @@
 
 */
 
+
 #include "self_dkdm_dialog.h"
 #include "wx_util.h"
 #include "kdm_output_panel.h"
 #include "kdm_cpl_panel.h"
+#include "static_text.h"
 #include "lib/film.h"
 #include "lib/screen.h"
+#include "lib/config.h"
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #else
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+LIBDCP_ENABLE_WARNINGS
 #endif
+LIBDCP_DISABLE_WARNINGS
 #include <wx/treectrl.h>
 #include <wx/listctrl.h>
 #include <wx/stdpaths.h>
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
+
 using std::string;
 using std::map;
 using std::list;
@@ -42,35 +51,36 @@ using std::pair;
 using std::cout;
 using std::vector;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
 
-SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
+
+SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, std::shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Make DKDM for DCP-o-matic"))
 {
 	/* Main sizer */
-	wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
+	auto vertical = new wxBoxSizer (wxVERTICAL);
 
 	/* Font for sub-headings */
 	wxFont subheading_font (*wxNORMAL_FONT);
 	subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
 	/* Sub-heading: CPL */
-	wxStaticText* h = new wxStaticText (this, wxID_ANY, _("CPL"));
+	auto h = new StaticText (this, _("CPL"));
 	h->SetFont (subheading_font);
-	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
+	vertical->Add (h);
 	_cpl = new KDMCPLPanel (this, film->cpls ());
 	vertical->Add (_cpl);
 
 	/* Sub-heading: output */
-	h = new wxStaticText (this, wxID_ANY, _("Output"));
+	h = new StaticText (this, _("Output"));
 	h->SetFont (subheading_font);
-	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+	vertical->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD);
 
 	_internal = new wxRadioButton (this, wxID_ANY, _("Save to KDM Creator tool's list"));
-	vertical->Add (_internal, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP);
+	vertical->Add (_internal, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP);
 
-	wxBoxSizer* w = new wxBoxSizer (wxHORIZONTAL);
+	auto w = new wxBoxSizer (wxHORIZONTAL);
 
 	_write_to = new wxRadioButton (this, wxID_ANY, _("Write to"));
 	w->Add (_write_to, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
@@ -89,49 +99,74 @@ SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film>
 
 	/* Make an overall sizer to get a nice border, and put some buttons in */
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (vertical, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
 	if (buttons) {
 		overall_sizer->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 	}
 
-	setup_sensitivity ();
-
 	SetSizer (overall_sizer);
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
 
-	_internal->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, bind (&SelfDKDMDialog::setup_sensitivity, this));
-	_write_to->Bind (wxEVT_COMMAND_RADIOBUTTON_SELECTED, bind (&SelfDKDMDialog::setup_sensitivity, this));
+	switch (Config::instance()->last_dkdm_write_type().get_value_or(Config::DKDM_WRITE_INTERNAL)) {
+	case Config::DKDM_WRITE_INTERNAL:
+		_internal->SetValue (true);
+		break;
+	case Config::DKDM_WRITE_FILE:
+		_write_to->SetValue (true);
+		break;
+	}
+	setup_sensitivity ();
+
+	_internal->Bind (wxEVT_RADIOBUTTON, bind (&SelfDKDMDialog::dkdm_write_type_changed, this));
+	_write_to->Bind (wxEVT_RADIOBUTTON, bind (&SelfDKDMDialog::dkdm_write_type_changed, this));
+}
+
+
+void
+SelfDKDMDialog::dkdm_write_type_changed ()
+{
+	setup_sensitivity ();
+
+	if (_internal->GetValue()) {
+		Config::instance()->set_last_dkdm_write_type(Config::DKDM_WRITE_INTERNAL);
+	} else if (_write_to->GetValue()) {
+		Config::instance()->set_last_dkdm_write_type(Config::DKDM_WRITE_FILE);
+	}
 }
 
+
 void
 SelfDKDMDialog::setup_sensitivity ()
 {
 	_folder->Enable (_write_to->GetValue ());
 
-	wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+	auto ok = dynamic_cast<wxButton *>(FindWindowById(wxID_OK, this));
 	if (ok) {
 		ok->Enable (_cpl->has_selected ());
 	}
 }
 
+
 boost::filesystem::path
 SelfDKDMDialog::cpl () const
 {
 	return _cpl->cpl ();
 }
 
+
 bool
 SelfDKDMDialog::internal () const
 {
 	return _internal->GetValue ();
 }
 
+
 boost::filesystem::path
 SelfDKDMDialog::directory () const
 {
-	return wx_to_std (_folder->GetPath ());
+	return wx_to_std (_folder->GetPath());
 }