X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=51721866972bb2779152f130be3a9c2e98935937;hb=e8748f158249d7be906f6c6cf2411df45dd07a24;hp=9bb7d863ea6ea5724c609eff8dca061c270e3fab;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 9bb7d863e..517218669 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,20 @@
 
 */
 
+
 #include "editable_list.h"
+#include "lib/screen.h"
 #include <dcp/certificate.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
+
 class Progress;
-class CertificateFileDialogWrapper;
+class TrustedDeviceDialog;
+
 
 class ScreenDialog : public wxDialog
 {
@@ -35,14 +41,16 @@ public:
 		wxString,
 		std::string name = "",
 		std::string notes = "",
-		boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
-		std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
+		boost::optional<dcp::Certificate> c = {},
+		boost::optional<std::string> f = {},
+		std::vector<TrustedDevice> d = {}
 		);
 
 	std::string name () const;
 	std::string notes () const;
 	boost::optional<dcp::Certificate> recipient () const;
-	std::vector<dcp::Certificate> trusted_devices () {
+	boost::optional<std::string> recipient_file () const;
+	std::vector<TrustedDevice> trusted_devices () {
 		return _trusted_devices;
 	}
 
@@ -53,7 +61,7 @@ private:
 	void setup_sensitivity ();
 	void set_recipient (boost::optional<dcp::Certificate>);
 
-	void set_trusted_devices (std::vector<dcp::Certificate> d) {
+	void set_trusted_devices (std::vector<TrustedDevice> d) {
 		_trusted_devices = d;
 	}
 
@@ -61,10 +69,11 @@ private:
 	wxTextCtrl* _name;
 	wxTextCtrl* _notes;
 	wxStaticText* _recipient_thumbprint;
+	wxStaticText* _recipient_file;
 	wxButton* _get_recipient_from_file;
 	wxButton* _download_recipient;
-	EditableList<dcp::Certificate, CertificateFileDialogWrapper>* _trusted_device_list;
+	EditableList<TrustedDevice, TrustedDeviceDialog>* _trusted_device_list;
 
 	boost::optional<dcp::Certificate> _recipient;
-	std::vector<dcp::Certificate> _trusted_devices;
+	std::vector<TrustedDevice> _trusted_devices;
 };