projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[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 258d5ab25372c5a6cdc724797b82596334f27be8..25271c7701dbb21ab26be7087f9c8bc23520e89f 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,39
+18,45
@@
*/
*/
+
#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:
- DownloadCertificatePanel (
wxWindow* parent,
DownloadCertificateDialog* dialog);
+ DownloadCertificatePanel (DownloadCertificateDialog* dialog);
- /* Do any setup that may take a noticeable amount of time */
- virtual void setup () {}
- virtual bool ready_to_download () const = 0;
- virtual void do_download (wxStaticText* message) = 0;
+ virtual void do_download () = 0;
virtual wxString name () const = 0;
virtual wxString name () const = 0;
+ virtual bool ready_to_download () const;
- void download (wxStaticText* message);
- void load (boost::filesystem::path);
+ void download ();
+ boost::optional<std::string> load_certificate (boost::filesystem::path);
+ boost::optional<std::string> load_certificate_from_chain (boost::filesystem::path);
boost::optional<dcp::Certificate> certificate () const;
protected:
boost::optional<dcp::Certificate> certificate () const;
protected:
- void layout ();
-
DownloadCertificateDialog* _dialog;
wxFlexGridSizer* _table;
DownloadCertificateDialog* _dialog;
wxFlexGridSizer* _table;
+ wxTextCtrl* _serial;
+ wxSizer* _overall_sizer;
private:
private:
- wxSizer* _overall_sizer;
boost::optional<dcp::Certificate> _certificate;
};
boost::optional<dcp::Certificate> _certificate;
};
+
#endif
#endif