X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=c7684d77fbad025a9ac845a0cb9bc0ddd1dd8c8e;hb=c6871fe8617b3de03662b7630355059393bf8043;hp=bec5318799e43cf16f6b52fae6265df7315945c3;hpb=e170d9908c191180aefe71ff7cfa81a5ba08ed83;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index bec531879..c7684d77f 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,28 +1,31 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 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 "download_certificate_dialog.h" #include "lib/compose.hpp" #include "lib/util.h" #include +#include #include #include #include @@ -33,46 +36,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 +{ +public: + explicit 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 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 +70,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,17 +100,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 +125,8 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona overall_sizer->Layout (); overall_sizer->SetSizeHints (this); + + setup_sensitivity (); } string @@ -141,6 +135,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 +151,11 @@ 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)); + 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, wxString::Format (_("Could not read certificate file.")), std_to_wx(e.what())); } } @@ -185,7 +187,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()); } }