X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=71d0ed99d27dfe74d0f8326a2a4864387a8b0a14;hb=e9e8951e0961564121f9c6cc4ce87555eebf9ec8;hp=0ecf223e69e1c99a500f55d2fc35df47684db6fe;hpb=bb7917d2ea06e6eaa566b00a279e9b5a6a351fc9;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 0ecf223e6..71d0ed99d 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,7 +21,10 @@
 #include "screen_dialog.h"
 #include "wx_util.h"
 #include "file_dialog_wrapper.h"
+#include "static_text.h"
 #include "download_certificate_dialog.h"
+#include "table_dialog.h"
+#include "dcpomatic_button.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
@@ -37,23 +40,64 @@ using boost::optional;
 using boost::bind;
 
 static string
-column (dcp::Certificate c)
+column (TrustedDevice d)
 {
-	return c.thumbprint ();
+	return d.thumbprint ();
 }
 
-class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
+class TrustedDeviceDialog : public TableDialog
 {
 public:
-	CertificateFileDialogWrapper (wxWindow* parent)
-		: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
+	explicit TrustedDeviceDialog (wxWindow* parent)
+		: TableDialog (parent, _("Trusted Device"), 3, 1, true)
 	{
+		add (_("Thumbprint"), true);
+		_thumbprint = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1)));
+		_file = add (new Button(this, _("Load certificate...")));
 
+		layout ();
+
+		_file->Bind (wxEVT_BUTTON, bind(&TrustedDeviceDialog::load_certificate, this));
+	}
+
+	void load_certificate ()
+	{
+		wxFileDialog* d = new wxFileDialog (this, _("Trusted Device certificate"));
+		d->ShowModal ();
+		try {
+			_certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath())));
+			_thumbprint->SetValue (std_to_wx(_certificate->thumbprint()));
+		} catch (dcp::MiscError& e) {
+			error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what())));
+		}
 	}
+
+	void set (TrustedDevice t)
+	{
+		_certificate = t.certificate ();
+		_thumbprint->SetValue (std_to_wx(t.thumbprint()));
+	}
+
+	optional<TrustedDevice> get ()
+	{
+		string const t = wx_to_std (_thumbprint->GetValue ());
+		if (_certificate && _certificate->thumbprint() == t) {
+			return TrustedDevice (*_certificate);
+		} else if (t.length() == 28) {
+			return TrustedDevice (t);
+		}
+
+		return optional<TrustedDevice> ();
+	}
+
+private:
+	wxTextCtrl* _thumbprint;
+	wxButton* _file;
+	boost::optional<dcp::Certificate> _certificate;
 };
 
 ScreenDialog::ScreenDialog (
-	wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices
+	wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<TrustedDevice> trusted_devices
 	)
 	: wxDialog (parent, wxID_ANY, title)
 	, _recipient (recipient)
@@ -84,11 +128,11 @@ ScreenDialog::ScreenDialog (
 
 	add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0));
 	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-	_recipient_thumbprint = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
+	_recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size);
 	_recipient_thumbprint->SetFont (font);
 	set_recipient (recipient);
-	_get_recipient_from_file = new wxButton (this, wxID_ANY, _("Get from file..."));
-	_download_recipient = new wxButton (this, wxID_ANY, _("Download..."));
+	_get_recipient_from_file = new Button (this, _("Get from file..."));
+	_download_recipient = new Button (this, _("Download..."));
 	s->Add (_recipient_thumbprint, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
 	s->Add (_get_recipient_from_file, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
 	s->Add (_download_recipient, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
@@ -98,14 +142,13 @@ ScreenDialog::ScreenDialog (
 	add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0));
 	++r;
 
-	vector<string> columns;
-	columns.push_back (wx_to_std (_("Thumbprint")));
-	_trusted_device_list = new EditableList<dcp::Certificate, CertificateFileDialogWrapper> (
+	vector<EditableListColumn> columns;
+	columns.push_back (EditableListColumn(wx_to_std(_("Thumbprint"))));
+	_trusted_device_list = new EditableList<TrustedDevice, TrustedDeviceDialog> (
 		this,
 		columns,
 		bind (&ScreenDialog::trusted_devices, this),
 		bind (&ScreenDialog::set_trusted_devices, this, _1),
-		bind (&always_valid),
 		bind (&column, _1),
 		false
 		);
@@ -113,9 +156,9 @@ ScreenDialog::ScreenDialog (
 	_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);
 
@@ -154,9 +197,13 @@ ScreenDialog::load_recipient (boost::filesystem::path file)
 	try {
 		/* Load this as a chain, in case it is one, and then pick the leaf certificate */
 		dcp::CertificateChain c (dcp::file_to_string (file));
+		if (c.unordered().empty()) {
+			error_dialog (this, _("Could not read certificate file."));
+			return;
+		}
 		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()));
+		error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
 	}
 }