X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=1ea9bf877a4d8d0e3b95f16527c0ae3eede0bcb3;hb=662b955300ea219acbf429c734ae16d0332f7487;hp=ddedb71ecc351bdaae0697ce58eb3193fad201cd;hpb=fa1a42e87704a93266245b0e7cf0dce2b5c42f66;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index ddedb71ec..1ea9bf877 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,116 +1,235 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2022 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 "dcpomatic_button.h" +#include "download_certificate_dialog.h" +#include "file_dialog.h" #include "screen_dialog.h" +#include "static_text.h" +#include "table_dialog.h" #include "wx_util.h" -#include "file_dialog_wrapper.h" -#include "download_certificate_dialog.h" #include "lib/compose.hpp" +#include "lib/scope_guard.h" #include "lib/util.h" +#include #include +#include +LIBDCP_DISABLE_WARNINGS #include #include -#include +LIBDCP_ENABLE_WARNINGS + using std::string; -using std::cout; using std::vector; -using boost::optional; using boost::bind; +using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif -static string -column (dcp::Certificate c) -{ - return c.thumbprint (); -} -class CertificateFileDialogWrapper : public FileDialogWrapper +class TrustedDeviceDialog : public TableDialog { public: - CertificateFileDialogWrapper (wxWindow* parent) - : FileDialogWrapper (parent, _("Select certificate file")) + explicit TrustedDeviceDialog (wxWindow* parent) + : TableDialog (parent, _("Trusted Device"), 3, 1, true) + { + add (_("Thumbprint"), true); + _thumbprint = add (new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(300, -1))); + _file = add (new Button(this, _("Load certificate..."))); + + layout (); + + _file->Bind (wxEVT_BUTTON, bind(&TrustedDeviceDialog::load_certificate, this)); + } + + void load_certificate () + { + FileDialog dialog(this, _("Trusted Device certificate"), wxEmptyString, wxFD_DEFAULT_STYLE, "SelectCertificatePath"); + if (!dialog.show()) { + return; + } + + try { + _certificate = dcp::Certificate(dcp::file_to_string(dialog.paths()[0])); + _thumbprint->SetValue (std_to_wx(_certificate->thumbprint())); + } catch (dcp::MiscError& e) { + error_dialog(this, wxString::Format(_("Could not load certificate (%s)"), std_to_wx(e.what()))); + } + } + + void set (TrustedDevice t) { + _certificate = t.certificate (); + _thumbprint->SetValue (std_to_wx(t.thumbprint())); + } + + optional get () + { + auto const t = wx_to_std (_thumbprint->GetValue()); + if (_certificate && _certificate->thumbprint() == t) { + return TrustedDevice (*_certificate); + } else if (t.length() == 28) { + return TrustedDevice (t); + } + return {}; } + +private: + wxTextCtrl* _thumbprint; + wxButton* _file; + boost::optional _certificate; }; -ScreenDialog::ScreenDialog (wxWindow* parent, wxString title, string name, optional recipient, vector trusted_devices) + +ScreenDialog::ScreenDialog ( + wxWindow* parent, + wxString title, + string name, + string notes, + optional recipient, + optional recipient_file, + vector trusted_devices + ) : wxDialog (parent, wxID_ANY, title) , _recipient (recipient) , _trusted_devices (trusted_devices) { - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); _sizer = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); int r = 0; - add_label_to_sizer (_sizer, this, _("Name"), true, wxGBPosition (r, 0)); + wxFont subheading_font(*wxNORMAL_FONT); + subheading_font.SetWeight(wxFONTWEIGHT_BOLD); + + auto subheading = new StaticText(this, _("Details")); + subheading->SetFont(subheading_font); + _sizer->Add(subheading, wxGBPosition(r, 0), wxGBSpan(1, 2)); + ++r; + + add_label_to_sizer(_sizer, this, _("Name"), true, wxGBPosition(r, 0), wxDefaultSpan, true); _name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)); _sizer->Add (_name, wxGBPosition (r, 1)); ++r; + add_label_to_sizer(_sizer, this, _("Notes"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _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); dc.SetFont (font); - wxSize size = dc.GetTextExtent (wxT ("1234567890123456789012345678")); + wxSize size = dc.GetTextExtent (wxT("1234567890123456789012345678")); size.SetHeight (-1); - 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->SetFont (font); - set_recipient (recipient); - _get_recipient_from_file = new wxButton (this, wxID_ANY, _("Get from file...")); - _download_recipient = new wxButton (this, wxID_ANY, _("Download...")); - s->Add (_recipient_thumbprint, 1, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + subheading = new StaticText(this, _("Recipient")); + subheading->SetFont(subheading_font); + _sizer->Add(subheading, wxGBPosition(r, 0), wxGBSpan(1, 2), wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); + ++r; + + _get_recipient_from_file = new Button (this, _("Get from file...")); + _download_recipient = new Button (this, _("Download...")); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (_get_recipient_from_file, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP); s->Add (_download_recipient, 0, wxLEFT | wxRIGHT | wxEXPAND, DCPOMATIC_SIZER_X_GAP); - _sizer->Add (s, wxGBPosition (r, 1)); + _sizer->Add(s, wxGBPosition(r, 0), wxGBSpan(1, 2)); + ++r; + + add_label_to_sizer(_sizer, this, _("Thumbprint"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _recipient_thumbprint = new StaticText (this, wxT (""), wxDefaultPosition, size); + _recipient_thumbprint->SetFont (font); + _sizer->Add(_recipient_thumbprint, wxGBPosition(r, 1)); + ++r; + + add_label_to_sizer(_sizer, this, _("Filename"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _recipient_file = new wxStaticText(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(600, -1), wxST_ELLIPSIZE_MIDDLE | wxST_NO_AUTORESIZE); + set_recipient_file(recipient_file.get_value_or("")); + _sizer->Add (_recipient_file, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP); + ++r; + + add_label_to_sizer(_sizer, this, _("Subject common name"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _subject_common_name = new wxStaticText(this, wxID_ANY, wxT("")); + _sizer->Add(_subject_common_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP); + ++r; + + add_label_to_sizer(_sizer, this, _("Subject organization name"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _subject_organization_name = new wxStaticText(this, wxID_ANY, wxT("")); + _sizer->Add(_subject_organization_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP); + ++r; + + add_label_to_sizer(_sizer, this, _("Issuer common name"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _issuer_common_name = new wxStaticText(this, wxID_ANY, wxT("")); + _sizer->Add(_issuer_common_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP); + ++r; + + add_label_to_sizer(_sizer, this, _("Issuer organization name"), true, wxGBPosition(r, 0), wxDefaultSpan, true); + _issuer_organization_name = new wxStaticText(this, wxID_ANY, wxT("")); + _sizer->Add(_issuer_organization_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP); ++r; - add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0)); + set_recipient (recipient); + + { + int flags = wxALIGN_CENTER_VERTICAL | wxTOP; +#ifdef __WXOSX__ + flags |= wxALIGN_RIGHT; + auto m = new StaticText (this, _("Other trusted devices") + wxT(":")); +#else + auto m = new StaticText (this, _("Other trusted devices")); +#endif + m->SetFont(subheading_font); + _sizer->Add(m, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SUBHEADING_TOP_PAD); + } ++r; - vector columns; - columns.push_back (wx_to_std (_("Thumbprint"))); - _trusted_device_list = new EditableList ( + vector columns; + columns.push_back (EditableListColumn(_("Thumbprint"))); + _trusted_device_list = new EditableList ( this, columns, bind (&ScreenDialog::trusted_devices, this), bind (&ScreenDialog::set_trusted_devices, this, _1), - bind (&always_valid), - bind (&column, _1), - false + [] (TrustedDevice const& d, int) { + return d.thumbprint(); + }, + EditableListTitle::INVISIBLE, + EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE ); - _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND); + _sizer->Add(_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP); ++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)); + _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); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); + auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } @@ -121,60 +240,91 @@ ScreenDialog::ScreenDialog (wxWindow* parent, wxString title, string name, optio setup_sensitivity (); } + string ScreenDialog::name () const { return wx_to_std (_name->GetValue()); } + +string +ScreenDialog::notes () const +{ + return wx_to_std (_notes->GetValue()); +} + + optional ScreenDialog::recipient () const { return _recipient; } + +optional +ScreenDialog::recipient_file () const +{ + auto const f = wx_to_std(_recipient_file->GetLabel()); + if (f.empty()) { + return {}; + } + return f; +} + + 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 ()); + set_recipient_file(file.string()); } 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())); } } + void ScreenDialog::get_recipient_from_file () { - wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File")); - if (d->ShowModal () == wxID_OK) { - load_recipient (boost::filesystem::path (wx_to_std (d->GetPath ()))); + FileDialog dialog(this, _("Select Certificate File"), wxEmptyString, wxFD_DEFAULT_STYLE , "SelectCertificatePath"); + if (dialog.show()) { + load_recipient(dialog.paths()[0]); } - d->Destroy (); setup_sensitivity (); } + void ScreenDialog::download_recipient () { - DownloadCertificateDialog* d = new DownloadCertificateDialog (this); - if (d->ShowModal() == wxID_OK) { - set_recipient (d->certificate ()); + DownloadCertificateDialog dialog(this); + if (dialog.ShowModal() == wxID_OK) { + set_recipient(dialog.certificate()); + set_recipient_file(dialog.url()); } - d->Destroy (); setup_sensitivity (); } + void ScreenDialog::setup_sensitivity () { - wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + auto ok = dynamic_cast (FindWindowById(wxID_OK, this)); if (ok) { ok->Enable (static_cast(_recipient) && !_name->GetValue().IsEmpty()); } } + void ScreenDialog::set_recipient (optional r) { @@ -182,6 +332,19 @@ ScreenDialog::set_recipient (optional r) if (_recipient) { _recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ())); + _subject_common_name->SetLabel(std_to_wx(_recipient->subject_common_name())); + _subject_organization_name->SetLabel(std_to_wx(_recipient->subject_organization_name())); + _issuer_common_name->SetLabel(std_to_wx(_recipient->issuer_common_name())); + _issuer_organization_name->SetLabel(std_to_wx(_recipient->issuer_organization_name())); _sizer->Layout (); } } + + +void +ScreenDialog::set_recipient_file(string file) +{ + checked_set(_recipient_file, file); + _recipient_file->SetToolTip(std_to_wx(file)); +} +