X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_panel.h;h=25271c7701dbb21ab26be7087f9c8bc23520e89f;hb=39fb8198febde1937019db1c300ec363aab5aa56;hp=258d5ab25372c5a6cdc724797b82596334f27be8;hpb=c0d3ccb11d1bc31767a431c72f99e4a84c26b194;p=dcpomatic.git

diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h
index 258d5ab25..25271c770 100644
--- 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.
 
@@ -18,39 +18,45 @@
 
 */
 
+
 #ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 #define DCPOMATIC_DOWNLOAD_CERTIFICATE_PANEL_H
 
+
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
+
 class DownloadCertificateDialog;
 
+
 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 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:
-	void layout ();
-
 	DownloadCertificateDialog* _dialog;
 	wxFlexGridSizer* _table;
+	wxTextCtrl* _serial;
+	wxSizer* _overall_sizer;
 
 private:
-	wxSizer* _overall_sizer;
 	boost::optional<dcp::Certificate> _certificate;
 };
 
+
 #endif