X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=fcb878bc0911af1be4b2ffff0980cb9b23806682;hb=03dd6e03f5ee261b9c1ed9328ad2762ef3b62057;hp=36e093ab87ba76085f11beed449fa3d3c9884752;hpb=f6caaae7747ed481fbaddcaa6afcfdefbbfc545a;p=dcpomatic.git

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 36e093ab8..fcb878bc0 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -19,6 +19,7 @@
 
 #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"
@@ -29,36 +30,89 @@
 
 using std::string;
 using std::cout;
+using std::vector;
 using boost::optional;
+using boost::bind;
 
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> recipient)
-	: TableDialog (parent, std_to_wx (title), 2, 1, true)
+static string
+column (dcp::Certificate c)
+{
+	return c.thumbprint ();
+}
+
+class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
+{
+public:
+	CertificateFileDialogWrapper (wxWindow* parent)
+		: FileDialogWrapper (parent, _("Select certificate file"))
+	{
+
+	}
+};
+
+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))
 	, _recipient (recipient)
+	, _trusted_devices (trusted_devices)
 {
-	add (_("Name"), true);
-	_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
+	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (overall_sizer);
 
-	add (_("Recipient certificate"), true);
-	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-	_recipient_thumbprint = new wxStaticText (this, wxID_ANY, wxT (""));
-	wxFont font = _recipient_thumbprint->GetFont ();
+	_sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	int r = 0;
+
+	add_label_to_sizer (_sizer, this, _("Name"), true, wxGBPosition (r, 0));
+	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1));
+	_sizer->Add (_name, wxGBPosition (r, 1));
+	++r;
+
+        wxClientDC dc (this);
+	wxFont font = _name->GetFont ();
 	font.SetFamily (wxFONTFAMILY_TELETYPE);
+	dc.SetFont (font);
+        wxSize size = dc.GetTextExtent (wxT ("1234567890123456789012345678"));
+        size.SetHeight (-1);
+
+	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->SetFont (font);
-	if (recipient) {
-		_recipient_thumbprint->SetLabel (std_to_wx (recipient->thumbprint ()));
-	}
+	set_recipient (recipient);
 	_get_recipient_from_file = new wxButton (this, wxID_ANY, _("Get from file..."));
 	_download_recipient = new wxButton (this, wxID_ANY, _("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);
-	add (s);
+	_sizer->Add (s, wxGBPosition (r, 1));
+	++r;
+
+	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> (
+		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));
 
+	overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+
+	overall_sizer->Layout ();
+	overall_sizer->SetSizeHints (this);
+
 	setup_sensitivity ();
-	layout ();
 }
 
 string
@@ -77,8 +131,7 @@ void
 ScreenDialog::load_recipient (boost::filesystem::path file)
 {
 	try {
-		_recipient = dcp::Certificate (dcp::file_to_string (file));
-		_recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ()));
+		set_recipient (dcp::Certificate (dcp::file_to_string (file)));
 	} catch (dcp::MiscError& e) {
 		error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data()));
 	}
@@ -101,8 +154,7 @@ ScreenDialog::download_recipient ()
 {
 	DownloadCertificateDialog* d = new DownloadCertificateDialog (this);
 	if (d->ShowModal() == wxID_OK) {
-		_recipient = d->certificate ();
-		_recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ()));
+		set_recipient (d->certificate ());
 	}
 	d->Destroy ();
 	setup_sensitivity ();
@@ -113,6 +165,17 @@ ScreenDialog::setup_sensitivity ()
 {
 	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
 	if (ok) {
-		ok->Enable (static_cast<bool>(_recipient));
+		ok->Enable (static_cast<bool>(_recipient) && !_name->GetValue().IsEmpty());
+	}
+}
+
+void
+ScreenDialog::set_recipient (optional<dcp::Certificate> r)
+{
+	_recipient = r;
+
+	if (_recipient) {
+		_recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ()));
+		_sizer->Layout ();
 	}
 }