X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=e01b9896259ab2121da9a9a4e768ec94eab058d9;hb=175ec3510439b2184026ee7e8dc75668448f4e21;hp=6c95c0baee7a98f62de7e432744293c89b134864;hpb=a618339514026c5f9129a9f786289952cdbd3cdf;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 6c95c0bae..e01b98962 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,24 +1,26 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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 "screen_dialog.h"
 #include "wx_util.h"
+#include "file_dialog_wrapper.h"
 #include "download_certificate_dialog.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
@@ -33,46 +35,26 @@ using std::vector;
 using boost::optional;
 using boost::bind;
 
-class FileDialogWrapper
+static string
+column (dcp::Certificate c)
 {
-public:
-	FileDialogWrapper (wxWindow* parent)
-		: _parent (parent)
-	{
-		_dialog = new wxFileDialog (parent, _("Select certificate file"));
-	}
-
-	void set (dcp::Certificate) {}
-
-	dcp::Certificate get () {
-		return dcp::Certificate (dcp::file_to_string (wx_to_std (_dialog->GetPath ())));
-	}
+	return c.thumbprint ();
+}
 
-	int ShowModal ()
+class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
+{
+public:
+	CertificateFileDialogWrapper (wxWindow* parent)
+		: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
 	{
-		return _dialog->ShowModal ();
-	}
 
-	void Destroy ()
-	{
-		_dialog->Destroy ();
-		/* eek! */
-		delete this;
 	}
-
-private:
-	wxWindow* _parent;
-	wxFileDialog* _dialog;
 };
 
-static string
-column (dcp::Certificate c)
-{
-	return c.thumbprint ();
-}
-
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices)
-	: wxDialog (parent, wxID_ANY, std_to_wx (title))
+ScreenDialog::ScreenDialog (
+	wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices
+	)
+	: wxDialog (parent, wxID_ANY, title)
 	, _recipient (recipient)
 	, _trusted_devices (trusted_devices)
 {
@@ -87,6 +69,11 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
 	_sizer->Add (_name, wxGBPosition (r, 1));
 	++r;
 
+	add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition (r, 0));
+	_notes = new wxTextCtrl (this, wxID_ANY, std_to_wx (notes), wxDefaultPosition, wxSize (320, -1));
+	_sizer->Add (_notes, wxGBPosition (r, 1));
+	++r;
+
         wxClientDC dc (this);
 	wxFont font = _name->GetFont ();
 	font.SetFamily (wxFONTFAMILY_TELETYPE);
@@ -112,8 +99,14 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
 
 	vector<string> columns;
 	columns.push_back (wx_to_std (_("Thumbprint")));
-	_trusted_device_list = new EditableList<dcp::Certificate, FileDialogWrapper> (
-		this, columns, bind (&ScreenDialog::trusted_devices, this), bind (&ScreenDialog::set_trusted_devices, this, _1), bind (&column, _1), false
+	_trusted_device_list = new EditableList<dcp::Certificate, CertificateFileDialogWrapper> (
+		this,
+		columns,
+		bind (&ScreenDialog::trusted_devices, this),
+		bind (&ScreenDialog::set_trusted_devices, this, _1),
+		bind (&always_valid),
+		bind (&column, _1),
+		false
 		);
 
 	_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
@@ -142,6 +135,12 @@ ScreenDialog::name () const
 	return wx_to_std (_name->GetValue());
 }
 
+string
+ScreenDialog::notes () const
+{
+	return wx_to_std (_notes->GetValue());
+}
+
 optional<dcp::Certificate>
 ScreenDialog::recipient () const
 {