/*
- 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.
*/
-#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)
_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);
_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));
+ _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>
+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<dcp::Certificate>
DownloadCertificatePanel::certificate () const
{
return _certificate;
+
}
void
/* 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();
}