projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Display the filename / URL that a screen certificate was obtained from (#1894).
[dcpomatic.git]
/
src
/
wx
/
download_certificate_panel.h
diff --git
a/src/wx/download_certificate_panel.h
b/src/wx/download_certificate_panel.h
index f51bcde133c3ec49f88cfc64306b9e72ddfff32d..0e7b2ab713198f6ffa5049027156874b24d94221 100644
(file)
--- a/
src/wx/download_certificate_panel.h
+++ b/
src/wx/download_certificate_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2021
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,15
+18,22
@@
*/
*/
+
#ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
#define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
#ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
#define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
+
+#include "lib/warnings.h"
#include <dcp/certificate.h>
#include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/optional.hpp>
#include <boost/optional.hpp>
+
class DownloadCertificateDialog;
class DownloadCertificateDialog;
+
class DownloadCertificatePanel : public wxPanel
{
public:
class DownloadCertificatePanel : public wxPanel
{
public:
@@
-37,8
+44,10
@@
public:
virtual bool ready_to_download () const;
void download ();
virtual bool ready_to_download () const;
void download ();
- boost::optional<std::string> load (boost::filesystem::path);
+ boost::optional<std::string> load_certificate (boost::filesystem::path, std::string url);
+ boost::optional<std::string> load_certificate_from_chain (boost::filesystem::path, std::string url);
boost::optional<dcp::Certificate> certificate () const;
boost::optional<dcp::Certificate> certificate () const;
+ boost::optional<std::string> url () const;
protected:
DownloadCertificateDialog* _dialog;
protected:
DownloadCertificateDialog* _dialog;
@@
-48,6
+57,8
@@
protected:
private:
boost::optional<dcp::Certificate> _certificate;
private:
boost::optional<dcp::Certificate> _certificate;
+ boost::optional<std::string> _url;
};
};
+
#endif
#endif