X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fscreen_dialog.cc;h=705a7ff585cd7ce518d6a55c200e40d0f0656b7d;hb=7ab80b672a5e7d0ec8ad5dccda7503c04d40ffb5;hp=b077a9bf93b4b29115084a63d9f3303b71800145;hpb=0a62857e4412d294712cfdf227fa38ae9ef371fe;p=dcpomatic.git diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index b077a9bf9..705a7ff58 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,84 +17,101 @@ */ -#include -#include -#include -#include -#include -#include "lib/compose.hpp" -#include "lib/util.h" #include "screen_dialog.h" #include "wx_util.h" -#include "progress.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) +static string +column (dcp::Certificate c) +{ + return c.thumbprint (); +} + +class CertificateFileDialogWrapper : public FileDialogWrapper +{ +public: + CertificateFileDialogWrapper (wxWindow* parent) + : FileDialogWrapper (parent, _("Select certificate file")) + { + + } +}; + +ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional recipient, vector trusted_devices) : wxDialog (parent, wxID_ANY, std_to_wx (title)) - , _certificate (certificate) + , _recipient (recipient) + , _trusted_devices (trusted_devices) { - wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6); - table->AddGrowableCol (1, 1); + wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + SetSizer (overall_sizer); - add_label_to_sizer (table, this, "Name", true); + _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)); - table->Add (_name, 1, wxEXPAND); + _sizer->Add (_name, wxGBPosition (r, 1)); + ++r; - add_label_to_sizer (table, this, "Server manufacturer", true); - _manufacturer = new wxChoice (this, wxID_ANY); - table->Add (_manufacturer, 1, wxEXPAND); + 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 (table, this, "Server serial number", true); - _serial = new wxTextCtrl (this, wxID_ANY); - table->Add (_serial, 1, wxEXPAND); - - add_label_to_sizer (table, this, "Certificate", true); + add_label_to_sizer (_sizer, this, _("Recipient certificate"), true, wxGBPosition (r, 0)); 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); - table->Add (s, 1, wxEXPAND); - - table->AddSpacer (0); - _progress = new Progress (this); - table->Add (_progress, 1, wxEXPAND); - - 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); + _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 + ); + + _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); - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); - overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6); - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL); if (buttons) { overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } - SetSizer (overall_sizer); overall_sizer->Layout (); overall_sizer->SetSizeHints (this); - _manufacturer->Append (_("Unknown")); - _manufacturer->Append (_("Doremi")); - _manufacturer->Append (_("Other")); - _manufacturer->SetSelection (0); - - _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)); - _serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreenDialog::setup_sensitivity, this)); - setup_sensitivity (); } @@ -104,118 +121,61 @@ ScreenDialog::name () const return wx_to_std (_name->GetValue()); } -shared_ptr -ScreenDialog::certificate () const +optional +ScreenDialog::recipient () const { - return _certificate; + return _recipient; } void -ScreenDialog::load_certificate (boost::filesystem::path file) +ScreenDialog::load_recipient (boost::filesystem::path file) { try { - _certificate.reset (new libdcp::Certificate (file)); - _certificate_text->SetValue (_certificate->certificate ()); - } catch (libdcp::MiscError& e) { - error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what())); + 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::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 (); setup_sensitivity (); } -static size_t -ftp_data (void* buffer, size_t size, size_t nmemb, void* stream) +void +ScreenDialog::download_recipient () { - FILE* f = reinterpret_cast (stream); - return fwrite (buffer, size, nmemb, f); + DownloadCertificateDialog* d = new DownloadCertificateDialog (this); + if (d->ShowModal() == wxID_OK) { + set_recipient (d->certificate ()); + } + d->Destroy (); + setup_sensitivity (); } void -ScreenDialog::download_certificate () +ScreenDialog::setup_sensitivity () { - if (_manufacturer->GetStringSelection() == _("Doremi")) { - string const serial = wx_to_std (_serial->GetValue ()); - if (serial.length() != 6) { - error_dialog (this, _("Doremi serial numbers must have 6 numbers")); - return; - } - - CURL* curl = curl_easy_init (); - if (!curl) { - error_dialog (this, N_("Could not set up libcurl")); - return; - } - - string const url = String::compose ( - "ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/dcp2000-%2.dcicerts.zip", - serial.substr(0, 3), serial - ); - - curl_easy_setopt (curl, CURLOPT_URL, url.c_str ()); - - ScopedTemporary temp_zip; - FILE* f = temp_zip.open ("wb"); - curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ftp_data); - curl_easy_setopt (curl, CURLOPT_WRITEDATA, f); - _progress->set_message (_("Downloading certificate from Doremi")); - CURLcode const cr = curl_easy_perform (curl); - _progress->set_value (50); - temp_zip.close (); - curl_easy_cleanup (curl); - if (cr != CURLE_OK) { - _progress->set_message (wxString::Format (_("Certificate download failed (%d)"), cr)); - return; - } - - _progress->set_message (_("Unpacking")); - struct zip* zip = zip_open (temp_zip.c_str(), 0, 0); - if (!zip) { - _progress->set_message ("Could not open certificate ZIP file"); - return; - } - - string const name_in_zip = String::compose ("dcp2000-%1.cert.sha256.pem", serial); - struct zip_file* zip_file = zip_fopen (zip, name_in_zip.c_str(), 0); - if (!zip_file) { - _progress->set_message ("Could not find certificate in ZIP file"); - return; - } - - ScopedTemporary temp_cert; - f = temp_cert.open ("wb"); - char buffer[4096]; - while (1) { - int const N = zip_fread (zip_file, buffer, sizeof (buffer)); - fwrite (buffer, 1, N, f); - if (N < int (sizeof (buffer))) { - break; - } - } - temp_cert.close (); - - _progress->set_value (100); - _progress->set_message (_("OK")); - load_certificate (temp_cert.file ()); + wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); + if (ok) { + ok->Enable (static_cast(_recipient) && !_name->GetValue().IsEmpty()); } } void -ScreenDialog::setup_sensitivity () +ScreenDialog::set_recipient (optional r) { - wxButton* ok = dynamic_cast (FindWindowById (wxID_OK, this)); - ok->Enable (_certificate); + _recipient = r; - _download_certificate->Enable (_manufacturer->GetStringSelection() == _("Doremi") && !_serial->GetValue().IsEmpty ()); + if (_recipient) { + _recipient_thumbprint->SetLabel (std_to_wx (_recipient->thumbprint ())); + _sizer->Layout (); + } }