X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=c7684d77fbad025a9ac845a0cb9bc0ddd1dd8c8e;hp=503745683980f3b2a860ec09050c2b80bba01a84;hb=c6871fe8617b3de03662b7630355059393bf8043;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091 diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 503745683..c7684d77f 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,76 +1,132 @@ /* - Copyright (C) 2012-2014 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 -#include -#include -#include "lib/compose.hpp" -#include "lib/util.h" #include "screen_dialog.h" #include "wx_util.h" -#include "doremi_certificate_dialog.h" -#include "dolby_certificate_dialog.h" +#include "file_dialog_wrapper.h" +#include "download_certificate_dialog.h" +#include "lib/compose.hpp" +#include "lib/util.h" +#include +#include +#include +#include +#include using std::string; using std::cout; +using std::vector; using boost::optional; +using boost::bind; -ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional certificate) - : TableDialog (parent, std_to_wx (title), 2, true) - , _certificate (certificate) +static string +column (dcp::Certificate c) { - add (_("Name"), true); - _name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1))); + return c.thumbprint (); +} - add (_("Server manufacturer"), true); - _manufacturer = add (new wxChoice (this, wxID_ANY)); +class CertificateFileDialogWrapper : public FileDialogWrapper +{ +public: + explicit CertificateFileDialogWrapper (wxWindow* parent) + : FileDialogWrapper (parent, _("Select certificate file")) + { - add (_("Certificate"), true); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _load_certificate = new wxButton (this, wxID_ANY, _("Load from file...")); - _download_certificate = new wxButton (this, wxID_ANY, _("Download")); - s->Add (_load_certificate, 1, wxEXPAND); - s->Add (_download_certificate, 1, wxEXPAND); - add (s); - - add_spacer (); - _certificate_text = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (320, 256), wxTE_MULTILINE | wxTE_READONLY); - if (certificate) { - _certificate_text->SetValue (certificate->certificate ()); } - wxFont font = wxSystemSettings::GetFont (wxSYS_ANSI_FIXED_FONT); - font.SetPointSize (font.GetPointSize() / 2); - _certificate_text->SetFont (font); - add (_certificate_text); +}; + +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) +{ + wxBoxSizer* 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)); + _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)); + _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")); + 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); + 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)); + ++r; + + add_label_to_sizer (_sizer, this, _("Other trusted devices"), true, wxGBPosition (r, 0)); + ++r; + + 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 + ); - _manufacturer->Append (_("Unknown")); - _manufacturer->Append (_("Doremi")); - _manufacturer->Append (_("Dolby")); - _manufacturer->Append (_("Other")); - _manufacturer->SetSelection (0); + _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND); + ++r; - _load_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::select_certificate, this)); - _download_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_certificate, this)); - _manufacturer->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ScreenDialog::setup_sensitivity, 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); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } + + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); setup_sensitivity (); - layout (); } string @@ -79,29 +135,36 @@ ScreenDialog::name () const return wx_to_std (_name->GetValue()); } +string +ScreenDialog::notes () const +{ + return wx_to_std (_notes->GetValue()); +} + optional -ScreenDialog::certificate () const +ScreenDialog::recipient () const { - return _certificate; + return _recipient; } void -ScreenDialog::load_certificate (boost::filesystem::path file) +ScreenDialog::load_recipient (boost::filesystem::path file) { try { - _certificate = dcp::Certificate (dcp::file_to_string (file)); - _certificate_text->SetValue (_certificate->certificate ()); + /* 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)"), e.what())); + error_dialog (this, wxString::Format (_("Could not read certificate file.")), std_to_wx(e.what())); } } void -ScreenDialog::select_certificate () +ScreenDialog::get_recipient_from_file () { wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File")); if (d->ShowModal () == wxID_OK) { - load_certificate (boost::filesystem::path (wx_to_std (d->GetPath ()))); + load_recipient (boost::filesystem::path (wx_to_std (d->GetPath ()))); } d->Destroy (); @@ -109,18 +172,13 @@ ScreenDialog::select_certificate () } void -ScreenDialog::download_certificate () +ScreenDialog::download_recipient () { - if (_manufacturer->GetStringSelection() == _("Doremi")) { - DownloadCertificateDialog* d = new DoremiCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1)); - d->ShowModal (); - d->Destroy (); - } else if (_manufacturer->GetStringSelection() == _("Dolby")) { - DownloadCertificateDialog* d = new DolbyCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1)); - d->ShowModal (); - d->Destroy (); + DownloadCertificateDialog* d = new DownloadCertificateDialog (this); + if (d->ShowModal() == wxID_OK) { + set_recipient (d->certificate ()); } - + d->Destroy (); setup_sensitivity (); } @@ -128,10 +186,18 @@ void ScreenDialog::setup_sensitivity () { wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); - ok->Enable (_certificate); + if (ok) { + ok->Enable (static_cast(_recipient) && !_name->GetValue().IsEmpty()); + } +} - _download_certificate->Enable ( - _manufacturer->GetStringSelection() == _("Doremi") || - _manufacturer->GetStringSelection() == _("Dolby") - ); +void +ScreenDialog::set_recipient (optional r) +{ + _recipient = r; + + if (_recipient) { + _recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ())); + _sizer->Layout (); + } }