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 a8cb1cbed49c9c8d89035efa4335bcaabcf36237..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,47 +34,26 @@ using std::vector;
 using boost::optional;
 using boost::bind;
 
-class FileDialogWrapper
+static string
+column (dcp::Certificate c)
+{
+       return c.thumbprint ();
+}
+
+class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
 {
 public:
-       FileDialogWrapper (wxWindow* parent)
-               : _parent (parent)
+       CertificateFileDialogWrapper (wxWindow* parent)
+               : FileDialogWrapper (parent, _("Select certificate file"))
        {
-               _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 ())));
-       }
-
-       int ShowModal ()
-       {
-               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)
+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)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
@@ -111,18 +91,17 @@ 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
                );
 
        _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));
 
-       setup_sensitivity ();
-
        overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@ -132,6 +111,8 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
 
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
+
+       setup_sensitivity ();
 }
 
 string
@@ -184,7 +165,7 @@ 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());
        }
 }