X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=e8361dcd83581d751f2200771cfa202dac7f2eac;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=bec5318799e43cf16f6b52fae6265df7315945c3;hpb=e170d9908c191180aefe71ff7cfa81a5ba08ed83;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index bec531879..e8361dcd8 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,28 +1,33 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "screen_dialog.h" #include "wx_util.h" +#include "file_dialog_wrapper.h" +#include "static_text.h" #include "download_certificate_dialog.h" +#include "table_dialog.h" #include "lib/compose.hpp" #include "lib/util.h" #include +#include #include #include #include @@ -33,46 +38,67 @@ using std::vector; using boost::optional; using boost::bind; -class FileDialogWrapper +static string +column (TrustedDevice d) +{ + return d.thumbprint (); +} + +class TrustedDeviceDialog : public TableDialog { public: - FileDialogWrapper (wxWindow* parent) - : _parent (parent) + explicit TrustedDeviceDialog (wxWindow* parent) + : TableDialog (parent, _("Trusted Device"), 3, 1, true) { - _dialog = new wxFileDialog (parent, _("Select certificate file")); - } + add (_("Thumbprint"), true); + _thumbprint = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1))); + _file = add (new wxButton(this, wxID_ANY, _("Load certificate..."))); - void set (dcp::Certificate) {} + layout (); - dcp::Certificate get () { - return dcp::Certificate (dcp::file_to_string (wx_to_std (_dialog->GetPath ()))); + _file->Bind (wxEVT_BUTTON, bind(&TrustedDeviceDialog::load_certificate, this)); } - int ShowModal () + void load_certificate () { - return _dialog->ShowModal (); + wxFileDialog* d = new wxFileDialog (this, _("Trusted Device certificate")); + d->ShowModal (); + try { + _certificate = dcp::Certificate(dcp::file_to_string(wx_to_std(d->GetPath()))); + _thumbprint->SetValue (std_to_wx(_certificate->thumbprint())); + } catch (dcp::MiscError& e) { + error_dialog (this, wxString::Format(_("Could not load certficate (%s)"), std_to_wx(e.what()))); + } } - void Destroy () + void set (TrustedDevice t) { - _dialog->Destroy (); - /* eek! */ - delete this; + _certificate = t.certificate (); + _thumbprint->SetValue (std_to_wx(t.thumbprint())); + } + + optional get () + { + string const t = wx_to_std (_thumbprint->GetValue ()); + if (_certificate && _certificate->thumbprint() == t) { + return TrustedDevice (*_certificate); + } else if (t.length() == 28) { + return TrustedDevice (t); + } + + return optional (); } private: - wxWindow* _parent; - wxFileDialog* _dialog; + wxTextCtrl* _thumbprint; + wxButton* _file; + boost::optional _certificate; }; -static string -column (dcp::Certificate c) -{ - return c.thumbprint (); -} - -ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional recipient, vector trusted_devices) - : wxDialog (parent, wxID_ANY, std_to_wx (title)) +ScreenDialog::ScreenDialog ( + wxWindow* parent, wxString title, string name, string notes, optional recipient, vector trusted_devices + ) + : wxDialog (parent, wxID_ANY, title) , _recipient (recipient) , _trusted_devices (trusted_devices) { @@ -87,6 +113,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); @@ -96,7 +127,7 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona 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 = new StaticText (this, wxT (""), wxDefaultPosition, size); _recipient_thumbprint->SetFont (font); set_recipient (recipient); _get_recipient_from_file = new wxButton (this, wxID_ANY, _("Get from file...")); @@ -112,17 +143,21 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona vector columns; columns.push_back (wx_to_std (_("Thumbprint"))); - _trusted_device_list = new EditableList ( - this, columns, bind (&ScreenDialog::trusted_devices, this), bind (&ScreenDialog::set_trusted_devices, this, _1), bind (&column, _1), false + _trusted_device_list = new EditableList ( + 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; - _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 (); + _name->Bind (wxEVT_TEXT, boost::bind (&ScreenDialog::setup_sensitivity, this)); + _get_recipient_from_file->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::get_recipient_from_file, this)); + _download_recipient->Bind (wxEVT_BUTTON, boost::bind (&ScreenDialog::download_recipient, this)); overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); @@ -133,6 +168,8 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona overall_sizer->Layout (); overall_sizer->SetSizeHints (this); + + setup_sensitivity (); } string @@ -141,6 +178,12 @@ ScreenDialog::name () const return wx_to_std (_name->GetValue()); } +string +ScreenDialog::notes () const +{ + return wx_to_std (_notes->GetValue()); +} + optional ScreenDialog::recipient () const { @@ -151,9 +194,15 @@ void ScreenDialog::load_recipient (boost::filesystem::path file) { try { - set_recipient (dcp::Certificate (dcp::file_to_string (file))); + /* Load this as a chain, in case it is one, and then pick the leaf certificate */ + dcp::CertificateChain c (dcp::file_to_string (file)); + if (c.unordered().empty()) { + error_dialog (this, _("Could not read certificate file.")); + return; + } + set_recipient (c.leaf ()); } catch (dcp::MiscError& e) { - error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data())); + error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what())); } } @@ -185,7 +234,7 @@ ScreenDialog::setup_sensitivity () { wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); if (ok) { - ok->Enable (static_cast(_recipient)); + ok->Enable (static_cast(_recipient) && !_name->GetValue().IsEmpty()); } }