Add a stored list of DKDMs to the creator rather than just a load button (#767).

4 files changed, 37 insertions, 39 deletions

diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index f895e4a0a..1f0ead3cd 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -39,7 +39,8 @@ public:
 		boost::function<std::vector<T> ()> get,
 		boost::function<void (std::vector<T>)> set,
 		boost::function<std::string (T, int)> column,
-		bool can_edit = true
+		bool can_edit = true,
+		bool title = true
 		)
 		: wxPanel (parent)
 		, _get (get)
@@ -55,7 +56,11 @@ public:
 		table->AddGrowableCol (0, 1);
 		s->Add (table, 1, wxEXPAND);
 
-		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
+		long style = wxLC_REPORT | wxLC_SINGLE_SEL;
+		if (title) {
+			style |= wxLC_NO_HEADER;
+		}
+		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), style);
 
 		for (size_t i = 0; i < columns.size(); ++i) {
 			wxListItem ip;
@@ -104,6 +109,20 @@ public:
 		}
 	}
 
+	boost::optional<T> selection () const
+	{
+		int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (item == -1) {
+			return boost::optional<T> ();
+		}
+
+		std::vector<T> all = _get ();
+		DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ()));
+		return all[item];
+	}
+
+	boost::signals2::signal<void ()> SelectionChanged;
+
 private:
 
 	void add_to_control (T item)
@@ -125,13 +144,13 @@ private:
 			_edit->Enable (i >= 0);
 		}
 		_remove->Enable (i >= 0);
+
+		SelectionChanged ();
 	}
 
 	void add_clicked ()
 	{
-		T new_item;
 		S* dialog = new S (this);
-		dialog->set (new_item);
 
 		if (dialog->ShowModal() == wxID_OK) {
 			add_to_control (dialog->get ());
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 6c95c0bae..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"
@@ -33,44 +34,22 @@ 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 (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))
 	, _recipient (recipient)
@@ -112,7 +91,7 @@ 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> (
+	_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
 		);
 
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 2985516c4..5ae369415 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -24,7 +24,7 @@
 #include <boost/optional.hpp>
 
 class Progress;
-class FileDialogWrapper;
+class CertificateFileDialogWrapper;
 
 class ScreenDialog : public wxDialog
 {
@@ -59,7 +59,7 @@ private:
 	wxStaticText* _recipient_thumbprint;
 	wxButton* _get_recipient_from_file;
 	wxButton* _download_recipient;
-	EditableList<dcp::Certificate, FileDialogWrapper>* _trusted_device_list;
+	EditableList<dcp::Certificate, CertificateFileDialogWrapper>* _trusted_device_list;
 
 	boost::optional<dcp::Certificate> _recipient;
 	std::vector<dcp::Certificate> _trusted_devices;
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index e45f036d2..bc7fd43df 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -39,7 +39,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
 	wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
 	_targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT);
-	targets->Add (_targets, 1, wxEXPAND | wxTOP | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
 	_root = _targets->AddRoot ("Foo");