X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=0069b9fa321d56e0685d534d73f1fd8d2ea28e32;hb=5063594e6836cfabed7d55f4963da9c8cf3b9f11;hp=5b786f6c16bc14c560cf11d00500e98484836698;hpb=fa1a42e87704a93266245b0e7cf0dce2b5c42f66;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 5b786f6c1..0069b9fa3 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -1,30 +1,37 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #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
 {
@@ -33,13 +40,17 @@ public:
 		wxWindow *,
 		wxString,
 		std::string name = "",
-		boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
-		std::vector<dcp::Certificate> d = std::vector<dcp::Certificate> ()
+		std::string notes = "",
+		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;
 	}
 
@@ -49,18 +60,25 @@ private:
 	void download_recipient ();
 	void setup_sensitivity ();
 	void set_recipient (boost::optional<dcp::Certificate>);
+	void set_recipient_file(std::string file);
 
-	void set_trusted_devices (std::vector<dcp::Certificate> d) {
+	void set_trusted_devices (std::vector<TrustedDevice> d) {
 		_trusted_devices = d;
 	}
 
 	wxGridBagSizer* _sizer;
 	wxTextCtrl* _name;
+	wxTextCtrl* _notes;
 	wxStaticText* _recipient_thumbprint;
+	wxStaticText* _recipient_file;
+	wxStaticText* _subject_common_name;
+	wxStaticText* _subject_organization_name;
+	wxStaticText* _issuer_common_name;
+	wxStaticText* _issuer_organization_name;
 	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;
 };