X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_panel.cc;h=b3de4ca2c427e16aa8981dd78ff13432073adae7;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=2f3b435efaba5a4f66cc2a72f432ae1a20ad8ea3;hpb=7d293a3268c320f474d42fef15548635c3cb40b0;p=dcpomatic.git

diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 2f3b435ef..b3de4ca2c 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,17 +18,22 @@
 
 */
 
-#include "wx_util.h"
-#include "download_certificate_panel.h"
+
 #include "download_certificate_dialog.h"
+#include "download_certificate_panel.h"
+#include "wx_util.h"
+#include "lib/compose.hpp"
 #include "lib/signal_manager.h"
-#include <dcp/util.h>
+#include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
-#include <boost/bind.hpp>
+#include <dcp/util.h>
+#include <boost/bind/bind.hpp>
 
-using boost::function;
+
+using std::string;
 using boost::optional;
 
+
 DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* dialog)
 	: wxPanel (dialog->notebook(), wxID_ANY)
 	, _dialog (dialog)
@@ -41,7 +46,7 @@ DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* d
 
 	_overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-	add_label_to_sizer (_table, this, _("Serial number"), true);
+	add_label_to_sizer (_table, this, _("Serial number"), true, 0, wxALIGN_CENTER_VERTICAL);
 	_serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1));
 	_table->Add (_serial, 1, wxEXPAND);
 
@@ -51,20 +56,46 @@ DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* d
 	_overall_sizer->SetSizeHints (this);
 }
 
-void
-DownloadCertificatePanel::load (boost::filesystem::path file)
+
+optional<string>
+DownloadCertificatePanel::load_certificate (boost::filesystem::path file, string url)
+{
+	try {
+		_certificate = dcp::Certificate (dcp::file_to_string(file));
+		_url = url;
+	} catch (dcp::MiscError& e) {
+		return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
+	}
+	return {};
+}
+
+
+optional<string>
+DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path file, string url)
 {
 	try {
-		_certificate = dcp::Certificate (dcp::file_to_string (file));
+		_certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf();
+		_url = url;
 	} catch (dcp::MiscError& e) {
-		error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
+		return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
 	}
+	return {};
 }
 
+
 optional<dcp::Certificate>
 DownloadCertificatePanel::certificate () const
 {
 	return _certificate;
+
+}
+
+
+optional<string>
+DownloadCertificatePanel::url () const
+{
+	return _url;
+
 }
 
 void
@@ -75,11 +106,12 @@ DownloadCertificatePanel::download ()
 	/* Hack: without this the SetLabel() above has no visible effect */
 	wxMilliSleep (200);
 
-	signal_manager->when_idle (boost::bind (&DownloadCertificatePanel::do_download, this));
+	signal_manager->when_idle (boost::bind(&DownloadCertificatePanel::do_download, this));
 }
 
+
 bool
 DownloadCertificatePanel::ready_to_download () const
 {
-	return !_serial->IsEmpty ();
+	return !_serial->IsEmpty();
 }