One missing ->video.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 6c95c0baee7a98f62de7e432744293c89b134864..5afb50a2a3a7bb5b61688a0606b183f9818390ae 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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,46 +34,26 @@ 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<dcp::Certificate> (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))
+ScreenDialog::ScreenDialog (
+       wxWindow* parent, wxString title, string name, string notes, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices
+       )
+       : wxDialog (parent, wxID_ANY, title)
        , _recipient (recipient)
        , _trusted_devices (trusted_devices)
 {
@@ -87,6 +68,11 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
        _sizer->Add (_name, wxGBPosition (r, 1));
        ++r;
 
+       add_label_to_sizer (_sizer, this, _("Notes"), true, wxGBPosition (r, 0));
+       _notes = new wxTextCtrl (this, wxID_ANY, std_to_wx (notes), wxDefaultPosition, wxSize (320, -1));
+       _sizer->Add (_notes, wxGBPosition (r, 1));
+       ++r;
+
         wxClientDC dc (this);
        wxFont font = _name->GetFont ();
        font.SetFamily (wxFONTFAMILY_TELETYPE);
@@ -112,8 +98,14 @@ 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> (
-               this, columns, bind (&ScreenDialog::trusted_devices, this), bind (&ScreenDialog::set_trusted_devices, this, _1), bind (&column, _1), false
+       _trusted_device_list = new EditableList<dcp::Certificate, CertificateFileDialogWrapper> (
+               this,
+               columns,
+               bind (&ScreenDialog::trusted_devices, this),
+               bind (&ScreenDialog::set_trusted_devices, this, _1),
+               bind (&always_valid),
+               bind (&column, _1),
+               false
                );
 
        _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
@@ -142,6 +134,12 @@ ScreenDialog::name () const
        return wx_to_std (_name->GetValue());
 }
 
+string
+ScreenDialog::notes () const
+{
+       return wx_to_std (_notes->GetValue());
+}
+
 optional<dcp::Certificate>
 ScreenDialog::recipient () const
 {