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

[dcpomatic.git] / src / wx / screen_dialog.cc

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 6c95c0baee7a98f62de7e432744293c89b134864..fcb878bc0911af1be4b2ffff0980cb9b23806682 100644 (file)
--- 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
                );