X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=2985516c48870a6f6d68cb1613eef8b288c3470c;hb=e170d9908c191180aefe71ff7cfa81a5ba08ed83;hp=5c6d964b8297681405d501543c14843f463d5253;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 5c6d964b8..2985516c4 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -17,32 +17,50 @@
 
 */
 
+#include "editable_list.h"
+#include <dcp/certificate.h>
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
-#include <dcp/certificates.h>
-#include "table_dialog.h"
+#include <boost/optional.hpp>
 
 class Progress;
+class FileDialogWrapper;
 
-class ScreenDialog : public TableDialog
+class ScreenDialog : public wxDialog
 {
 public:
-	ScreenDialog (wxWindow *, std::string, std::string name = "", boost::shared_ptr<dcp::Certificate> c = boost::shared_ptr<dcp::Certificate> ());
+	ScreenDialog (
+		wxWindow *,
+		std::string,
+		std::string name = "",
+		boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
+		std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
+		);
 
 	std::string name () const;
-	boost::shared_ptr<dcp::Certificate> certificate () const;
-	
+	boost::optional<dcp::Certificate> recipient () const;
+	std::vector<dcp::Certificate> trusted_devices () {
+		return _trusted_devices;
+	}
+
 private:
-	void select_certificate ();
-	void load_certificate (boost::filesystem::path);
-	void download_certificate ();
+	void get_recipient_from_file ();
+	void load_recipient (boost::filesystem::path);
+	void download_recipient ();
 	void setup_sensitivity ();
-	
+	void set_recipient (boost::optional<dcp::Certificate>);
+
+	void set_trusted_devices (std::vector<dcp::Certificate> d) {
+		_trusted_devices = d;
+	}
+
+	wxGridBagSizer* _sizer;
 	wxTextCtrl* _name;
-	wxChoice* _manufacturer;
-	wxButton* _load_certificate;
-	wxButton* _download_certificate;
-	wxTextCtrl* _certificate_text;
+	wxStaticText* _recipient_thumbprint;
+	wxButton* _get_recipient_from_file;
+	wxButton* _download_recipient;
+	EditableList<dcp::Certificate, FileDialogWrapper>* _trusted_device_list;
 
-	boost::shared_ptr<dcp::Certificate> _certificate;
+	boost::optional<dcp::Certificate> _recipient;
+	std::vector<dcp::Certificate> _trusted_devices;
 };