X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=e01b9896259ab2121da9a9a4e768ec94eab058d9;hp=f94400be7fed94ff873601d5f7740a714fe41089;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=58588c485eac7c488a574fe923576f109ec0134e diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index f94400be7..e01b98962 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,72 +1,131 @@ /* - Copyright (C) 2012 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 "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 using std::string; using std::cout; -using boost::shared_ptr; +using std::vector; +using boost::optional; +using boost::bind; -ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr certificate) - : wxDialog (parent, wxID_ANY, std_to_wx (title)) - , _certificate (certificate) +static string +column (dcp::Certificate c) { - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); - table->AddGrowableCol (1, 1); - - add_label_to_sizer (table, this, "Name", true); - _name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)); - table->Add (_name, 1, wxEXPAND); + return c.thumbprint (); +} - add_label_to_sizer (table, this, "Certificate", true); - _certificate_load = new wxButton (this, wxID_ANY, wxT ("Load from file...")); - table->Add (_certificate_load, 1, wxEXPAND); +class CertificateFileDialogWrapper : public FileDialogWrapper +{ +public: + CertificateFileDialogWrapper (wxWindow* parent) + : FileDialogWrapper (parent, _("Select certificate file")) + { - table->AddSpacer (0); - _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); - table->Add (_certificate_text, 1, wxEXPAND); - +}; + +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); - overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6); - + 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 (&always_valid), + bind (&column, _1), + false + ); + + _sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND); + ++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)); + + overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } - SetSizer (overall_sizer); overall_sizer->Layout (); overall_sizer->SetSizeHints (this); - _certificate_load->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::load_certificate, this)); - setup_sensitivity (); } @@ -76,34 +135,67 @@ ScreenDialog::name () const return wx_to_std (_name->GetValue()); } -shared_ptr -ScreenDialog::certificate () const +string +ScreenDialog::notes () const +{ + return wx_to_std (_notes->GetValue()); +} + +optional +ScreenDialog::recipient () const { - return _certificate; + return _recipient; } void -ScreenDialog::load_certificate () +ScreenDialog::load_recipient (boost::filesystem::path file) { - wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File")); + try { + set_recipient (dcp::Certificate (dcp::file_to_string (file))); + } catch (dcp::MiscError& e) { + error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), std_to_wx(e.what()).data())); + } +} +void +ScreenDialog::get_recipient_from_file () +{ + wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File")); if (d->ShowModal () == wxID_OK) { - try { - _certificate.reset (new dcp::Certificate (boost::filesystem::path (wx_to_std (d->GetPath ())))); - _certificate_text->SetValue (_certificate->certificate ()); - } catch (dcp::MiscError& e) { - error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what())); - } + load_recipient (boost::filesystem::path (wx_to_std (d->GetPath ()))); } - d->Destroy (); setup_sensitivity (); } +void +ScreenDialog::download_recipient () +{ + DownloadCertificateDialog* d = new DownloadCertificateDialog (this); + if (d->ShowModal() == wxID_OK) { + set_recipient (d->certificate ()); + } + d->Destroy (); + setup_sensitivity (); +} + 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()); + } +} + +void +ScreenDialog::set_recipient (optional r) +{ + _recipient = r; + + if (_recipient) { + _recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ())); + _sizer->Layout (); + } }