Display the filename / URL that a screen certificate was obtained from (#1894).

[dcpomatic.git] / src / wx / download_certificate_panel.cc

diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index bbaddeef254f1eef268df98e3b65f148e661dfae..b3de4ca2c427e16aa8981dd78ff13432073adae7 100644 (file)
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,22 @@
 
 */
 
-#include "wx_util.h"
-#include "download_certificate_panel.h"
+
 #include "download_certificate_dialog.h"
-#include "lib/signal_manager.h"
+#include "download_certificate_panel.h"
+#include "wx_util.h"
 #include "lib/compose.hpp"
-#include <dcp/util.h>
+#include "lib/signal_manager.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
+#include <dcp/util.h>
 #include <boost/bind/bind.hpp>
 
+
 using std::string;
-using boost::function;
 using boost::optional;
 
+
 DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* dialog)
        : wxPanel (dialog->notebook(), wxID_ANY)
        , _dialog (dialog)
@@ -44,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);
 
@@ -56,26 +58,28 @@ DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* d
 
 
 optional<string>
-DownloadCertificatePanel::load_certificate (boost::filesystem::path file)
+DownloadCertificatePanel::load_certificate (boost::filesystem::path file, string url)
 {
        try {
-               _certificate = dcp::Certificate (dcp::file_to_string (file));
+               _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>();
+       return {};
 }
 
 
 optional<string>
-DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path file)
+DownloadCertificatePanel::load_certificate_from_chain (boost::filesystem::path file, string url)
 {
        try {
                _certificate = dcp::CertificateChain (dcp::file_to_string(file)).leaf();
+               _url = url;
        } catch (dcp::MiscError& e) {
                return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
        }
-       return optional<string>();
+       return {};
 }
 
 
@@ -83,6 +87,15 @@ optional<dcp::Certificate>
 DownloadCertificatePanel::certificate () const
 {
        return _certificate;
+
+}
+
+
+optional<string>
+DownloadCertificatePanel::url () const
+{
+       return _url;
+
 }
 
 void
@@ -93,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();
 }