X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.h;h=913480d76be734e0b7febfb930b80bf904e4a02a;hp=5c6d964b8297681405d501543c14843f463d5253;hb=386e25f3b9d3fa59cbdeed458d9b3e0d21e338b8;hpb=4616b19fb5241a54c9d57f7a91bb975f41aed14b

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 5c6d964b8..913480d76 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -1,48 +1,71 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 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 <wx/wx.h>
 #include <boost/shared_ptr.hpp>
-#include <dcp/certificates.h>
-#include "table_dialog.h"
+#include <boost/optional.hpp>
 
 class Progress;
+class TrustedDeviceDialog;
 
-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 *,
+		wxString,
+		std::string name = "",
+		std::string notes = "",
+		boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> (),
+		std::vector<TrustedDevice> d = std::vector<TrustedDevice>()
+		);
 
 	std::string name () const;
-	boost::shared_ptr<dcp::Certificate> certificate () const;
-	
+	std::string notes () const;
+	boost::optional<dcp::Certificate> recipient () const;
+	std::vector<TrustedDevice> 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<TrustedDevice> d) {
+		_trusted_devices = d;
+	}
+
+	wxGridBagSizer* _sizer;
 	wxTextCtrl* _name;
-	wxChoice* _manufacturer;
-	wxButton* _load_certificate;
-	wxButton* _download_certificate;
-	wxTextCtrl* _certificate_text;
+	wxTextCtrl* _notes;
+	wxStaticText* _recipient_thumbprint;
+	wxButton* _get_recipient_from_file;
+	wxButton* _download_recipient;
+	EditableList<TrustedDevice, TrustedDeviceDialog>* _trusted_device_list;
 
-	boost::shared_ptr<dcp::Certificate> _certificate;
+	boost::optional<dcp::Certificate> _recipient;
+	std::vector<TrustedDevice> _trusted_devices;
 };