X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdolby_doremi_certificate_panel.cc;h=c37b42e43796193d4fe1276094aca11ab77a7b70;hb=9001a63be211fd8e97431f8fc07c66af01554f5a;hp=57dc1eef187c2cebfe18d75b951f8325cc005615;hpb=be511f16fa59cb97d0f671546de2055baea1cabf;p=dcpomatic.git diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc index 57dc1eef1..c37b42e43 100644 --- a/src/wx/dolby_doremi_certificate_panel.cc +++ b/src/wx/dolby_doremi_certificate_panel.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-2015 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 . */ @@ -35,28 +36,12 @@ using std::cout; using std::list; using boost::function; using boost::optional; +using dcp::raw_convert; -DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog) - : DownloadCertificatePanel (parent, dialog) +DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog) + : DownloadCertificatePanel (dialog) { - add_label_to_sizer (_table, this, _("Serial number"), true); - _serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1)); - _table->Add (_serial, 1, wxEXPAND); - - _serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog)); - layout (); -} - -void -DolbyDoremiCertificatePanel::download (wxStaticText* message) -{ - message->SetLabel (_("Downloading certificate")); - - /* Hack: without this the SetLabel() above has no visible effect */ - wxMilliSleep (200); - - signal_manager->when_idle (boost::bind (&DolbyDoremiCertificatePanel::finish_download, this, wx_to_std (_serial->GetValue ()), message)); } static void @@ -89,7 +74,7 @@ try_ims (list& urls, list& files, string prefix, string serial) static void try_cat862 (list& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial); + int const serial_int = raw_convert (serial); string cat862; if (serial_int <= 510999) { @@ -108,7 +93,7 @@ try_cat862 (list& urls, list& files, string prefix, string seria static void try_dsp100 (list& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial); + int const serial_int = raw_convert (serial); string dsp100; if (serial_int <= 999) { @@ -127,7 +112,7 @@ try_dsp100 (list& urls, list& files, string prefix, string seria static void try_cat745 (list& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial.substr (1)); + int const serial_int = raw_convert (serial.substr (1)); string cat745; if (serial_int <= 999) { @@ -146,7 +131,7 @@ try_cat745 (list& urls, list& files, string prefix, string seria static void try_cp850 (list& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial.substr (1)); + int const serial_int = raw_convert (serial.substr (1)); int const lower = serial_int - (serial_int % 1000); urls.push_back (String::compose ("%1CP850_CAT1600_F%2-F%3/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%4.zip", prefix, lower, lower + 999, serial_int)); @@ -154,8 +139,10 @@ try_cp850 (list& urls, list& files, string prefix, string serial } void -DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* message) +DolbyDoremiCertificatePanel::do_download () { + string const serial = wx_to_std (_serial->GetValue()); + /* Try dcp2000, imb and ims prefixes (see mantis #375) */ string const prefix = "ftp://anonymous@ftp.cinema.dolby.com/Certificates/"; @@ -190,7 +177,7 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa list::const_iterator i = urls.begin (); list::const_iterator j = files.begin (); while (!ok && i != urls.end ()) { - optional error = get_from_zip_url (*i++, *j++, true, boost::bind (&DownloadCertificatePanel::load, this, _1)); + optional error = get_from_zip_url (*i++, *j++, true, true, boost::bind (&DownloadCertificatePanel::load, this, _1)); if (error) { errors.push_back (error.get ()); } else { @@ -199,22 +186,22 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa } if (ok) { - message->SetLabel (_("Certificate downloaded")); + _dialog->message()->SetLabel (_("Certificate downloaded")); _dialog->setup_sensitivity (); } else { - message->SetLabel (wxT ("")); + _dialog->message()->SetLabel (wxT ("")); - SafeStringStream s; + string s; BOOST_FOREACH (string e, errors) { - s << e << "\n"; + s += e + "\n"; } - error_dialog (this, std_to_wx (s.str ())); + error_dialog (this, std_to_wx (s)); } } -bool -DolbyDoremiCertificatePanel::ready_to_download () const +wxString +DolbyDoremiCertificatePanel::name () const { - return !_serial->IsEmpty (); + return _("Dolby / Doremi"); }