X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=8bf2d0e419856ddd96096bbb8f2c0c7f16a0bb35;hp=705a7ff585cd7ce518d6a55c200e40d0f0656b7d;hb=ad5c8849fc3ef5aad88201f28db5474a60db4436;hpb=1199c50099e39d8ee60f00ba2a86b6c7ab57e414

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 705a7ff58..8bf2d0e41 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,19 +1,20 @@
 /*
-    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/>.
 
 */
 
@@ -24,6 +25,7 @@
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
+#include <dcp/certificate_chain.h>
 #include <wx/filepicker.h>
 #include <wx/validate.h>
 #include <iostream>
@@ -50,8 +52,10 @@ public:
 	}
 };
 
-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)
 {
@@ -66,6 +70,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);
@@ -92,15 +101,20 @@ 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, CertificateFileDialogWrapper> (
-		this, columns, bind (&ScreenDialog::trusted_devices, this), bind (&ScreenDialog::set_trusted_devices, this, _1), bind (&column, _1), false
+		this,
+		columns,
+		bind (&ScreenDialog::trusted_devices, this),
+		bind (&ScreenDialog::set_trusted_devices, this, _1),
+		bind (&column, _1),
+		false
 		);
 
 	_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
 	++r;
 
-	_name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreenDialog::setup_sensitivity, this));
-	_get_recipient_from_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::get_recipient_from_file, this));
-	_download_recipient->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_recipient, this));
+	_name->Bind (wxEVT_TEXT, boost::bind (&ScreenDialog::setup_sensitivity, this));
+	_get_recipient_from_file->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::get_recipient_from_file, this));
+	_download_recipient->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::download_recipient, this));
 
 	overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
@@ -121,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
 {
@@ -131,7 +151,9 @@ void
 ScreenDialog::load_recipient (boost::filesystem::path file)
 {
 	try {
-		set_recipient (dcp::Certificate (dcp::file_to_string (file)));
+		/* Load this as a chain, in case it is one, and then pick the leaf certificate */
+		dcp::CertificateChain c (dcp::file_to_string (file));
+		set_recipient (c.leaf ());
 	} catch (dcp::MiscError& e) {
 		error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
 	}