X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_panel.cc;h=bbaddeef254f1eef268df98e3b65f148e661dfae;hb=bd7f4bbde17d2087ba4c4bddf6439b3df869b1db;hp=4052e44a6e8245ff7d1bde1f146eeef9e09f5d1d;hpb=f1dbcec7552052856369631e77c5eb160badd619;p=dcpomatic.git

diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 4052e44a6..bbaddeef2 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,15 +20,20 @@
 
 #include "wx_util.h"
 #include "download_certificate_panel.h"
+#include "download_certificate_dialog.h"
+#include "lib/signal_manager.h"
+#include "lib/compose.hpp"
 #include <dcp/util.h>
+#include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
+using std::string;
 using boost::function;
 using boost::optional;
 
-DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog)
-	: wxPanel (parent, wxID_ANY)
+DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* dialog)
+	: wxPanel (dialog->notebook(), wxID_ANY)
 	, _dialog (dialog)
 {
 	_overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -38,27 +43,61 @@ DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCe
 	_table->AddGrowableCol (1, 1);
 
 	_overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-}
 
-void
-DownloadCertificatePanel::layout ()
-{
+	add_label_to_sizer (_table, this, _("Serial number"), true);
+	_serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1));
+	_table->Add (_serial, 1, wxEXPAND);
+
+	_serial->Bind (wxEVT_TEXT, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog));
+
 	_overall_sizer->Layout ();
 	_overall_sizer->SetSizeHints (this);
 }
 
-void
-DownloadCertificatePanel::load (boost::filesystem::path file)
+
+optional<string>
+DownloadCertificatePanel::load_certificate (boost::filesystem::path file)
 {
 	try {
 		_certificate = dcp::Certificate (dcp::file_to_string (file));
 	} 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<string>();
+}
+
+
+optional<string>
+DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path file)
+{
+	try {
+		_certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf();
+	} catch (dcp::MiscError& e) {
+		return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
 	}
+	return optional<string>();
 }
 
+
 optional<dcp::Certificate>
 DownloadCertificatePanel::certificate () const
 {
 	return _certificate;
 }
+
+void
+DownloadCertificatePanel::download ()
+{
+	_dialog->message()->SetLabel (_("Downloading certificate"));
+
+	/* Hack: without this the SetLabel() above has no visible effect */
+	wxMilliSleep (200);
+
+	signal_manager->when_idle (boost::bind (&DownloadCertificatePanel::do_download, this));
+}
+
+bool
+DownloadCertificatePanel::ready_to_download () const
+{
+	return !_serial->IsEmpty ();
+}