X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fself_dkdm_dialog.cc;h=4c10c8f6bce7ad58ff3a1c775122312229fcf3c2;hp=fed233ad14e4f851a8b8f977bc7b4c4fe20faa05;hb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;hpb=9394ce6d3b840ec0af141d6435f394a5ad85c2ed

diff --git a/src/wx/self_dkdm_dialog.cc b/src/wx/self_dkdm_dialog.cc
index fed233ad1..4c10c8f6b 100644
--- a/src/wx/self_dkdm_dialog.cc
+++ b/src/wx/self_dkdm_dialog.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,17 +22,24 @@
 #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 "lib/warnings.h"
 #include <libcxml/cxml.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/treectrl.h>
 #include <wx/listctrl.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 using std::string;
@@ -42,6 +50,7 @@ using std::cout;
 using std::vector;
 using std::make_pair;
 using boost::shared_ptr;
+using boost::bind;
 
 SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 	: wxDialog (parent, wxID_ANY, _("Make DKDM for DCP-o-matic"))
@@ -54,20 +63,24 @@ SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film>
 	subheading_font.SetWeight (wxFONTWEIGHT_BOLD);
 
 	/* Sub-heading: CPL */
-	wxStaticText* h = new wxStaticText (this, wxID_ANY, _("CPL"));
+	wxStaticText* h = new StaticText (this, _("CPL"));
 	h->SetFont (subheading_font);
 	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2);
 	_cpl = new KDMCPLPanel (this, film->cpls ());
 	vertical->Add (_cpl);
 
-	/* Sub-heading: Output */
-	h = new wxStaticText (this, wxID_ANY, _("Output"));
+	/* Sub-heading: output */
+	h = new StaticText (this, _("Output"));
 	h->SetFont (subheading_font);
 	vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_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);
+
+	wxBoxSizer* w = new wxBoxSizer (wxHORIZONTAL);
 
-	add_label_to_sizer (table, this, _("Write to"), true);
+	_write_to = new wxRadioButton (this, wxID_ANY, _("Write to"));
+	w->Add (_write_to, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 #ifdef DCPOMATIC_USE_OWN_PICKER
 	_folder = new DirPickerCtrl (this);
@@ -77,9 +90,9 @@ SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film>
 
 	_folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
 
-	table->Add (_folder, 1, wxEXPAND);
+	w->Add (_folder, 1, wxEXPAND);
 
-	vertical->Add (table);
+	vertical->Add (w, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
 
 	/* Make an overall sizer to get a nice border, and put some buttons in */
 
@@ -91,16 +104,41 @@ SelfDKDMDialog::SelfDKDMDialog (wxWindow* parent, boost::shared_ptr<const Film>
 		overall_sizer->Add (buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 	}
 
-	setup_sensitivity ();
-
 	SetSizer (overall_sizer);
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (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));
 	if (ok) {
 		ok->Enable (_cpl->has_selected ());
@@ -113,6 +151,12 @@ SelfDKDMDialog::cpl () const
 	return _cpl->cpl ();
 }
 
+bool
+SelfDKDMDialog::internal () const
+{
+	return _internal->GetValue ();
+}
+
 boost::filesystem::path
 SelfDKDMDialog::directory () const
 {