X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=90e315aab737722bd39da9a213b71880d26bc602;hb=5fd2715af0b316d5ad0c3b08812f24af869f9fcc;hp=0d6ecbab011d28b574360d93d53db7eba8097e24;hpb=b40f6bc1a3ab39b1bc0fa8fda1f97cb6a01bc85c;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 0d6ecbab0..90e315aab 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/editable_list.h"
+#include "wx/file_dialog.h"
 #include "wx/file_picker_ctrl.h"
 #include "wx/full_config_dialog.h"
 #include "wx/job_view_dialog.h"
@@ -179,7 +180,7 @@ public:
 			overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
 		);
 		dkdm_sizer->Add(_dkdm, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
-		wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL);
+		auto dkdm_buttons = new wxBoxSizer(wxVERTICAL);
 		_add_dkdm = new Button (overall_panel, _("Add..."));
 		dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
 		_add_dkdm_folder = new Button (overall_panel, _("Add folder..."));
@@ -489,58 +490,55 @@ private:
 
 	void add_dkdm_clicked ()
 	{
-		auto d = new wxFileDialog(
-			this,
-			_("Select DKDM file"),
-			wxEmptyString,
-			wxEmptyString,
-			wxT("XML files|*.xml|All files|*.*"),
-			wxFD_MULTIPLE
-			);
+		auto dialog = new FileDialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath");
 
-		ScopeGuard sg = [d]() { d->Destroy(); };
+		ScopeGuard sg = [dialog]() { dialog->Destroy(); };
 
-		if (d->ShowModal() != wxID_OK) {
+		if (!dialog->show()) {
 			return;
 		}
 
+		for (auto path: dialog->paths()) {
+			add_dkdm(path);
+		}
+	}
+
+	void add_dkdm(boost::filesystem::path path)
+	{
 		auto chain = Config::instance()->decryption_chain();
 		DCPOMATIC_ASSERT (chain->key());
 
-		wxArrayString paths;
-		d->GetPaths(paths);
-		for (unsigned int i = 0; i < paths.GetCount(); ++i) {
-			try {
-				dcp::EncryptedKDM ekdm(dcp::file_to_string(wx_to_std(paths[i]), MAX_KDM_SIZE));
-				/* Decrypt the DKDM to make sure that we can */
-				dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
-
-				auto new_dkdm = make_shared<DKDM>(ekdm);
-				auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
-				if (!group) {
-					group = Config::instance()->dkdms ();
-				}
-				add_dkdm(new_dkdm, group);
-			} catch (dcp::KDMFormatError& e) {
-				error_dialog (
-					this,
-					_("Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM at all."),
-					std_to_wx(e.what())
-					);
-				return;
-			} catch (dcp::KDMDecryptionError &) {
-				error_dialog (
-					this,
-					_("Could not decrypt the DKDM.  Perhaps it was not created with the correct certificate.")
-					);
-			} catch (dcp::MiscError& e) {
-				error_dialog (
-					this,
-					_("Could not read file as a KDM.  It is much too large.  Make sure you are loading a DKDM (XML) file."),
-					std_to_wx(e.what())
-					);
+		try {
+			dcp::EncryptedKDM ekdm(dcp::file_to_string(path, MAX_KDM_SIZE));
+			/* Decrypt the DKDM to make sure that we can */
+			dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
+
+			auto new_dkdm = make_shared<DKDM>(ekdm);
+			auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
+			if (!group) {
+				group = Config::instance()->dkdms ();
 			}
+			add_dkdm(new_dkdm, group);
+		} catch (dcp::KDMFormatError& e) {
+			error_dialog (
+				this,
+				_("Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM at all."),
+				std_to_wx(e.what())
+				);
+			return;
+		} catch (dcp::KDMDecryptionError &) {
+			error_dialog (
+				this,
+				_("Could not decrypt the DKDM.  Perhaps it was not created with the correct certificate.")
+				);
+		} catch (dcp::MiscError& e) {
+			error_dialog (
+				this,
+				_("Could not read file as a KDM.  It is much too large.  Make sure you are loading a DKDM (XML) file."),
+				std_to_wx(e.what())
+				);
 		}
+
 		update_dkdm_view();
 	}