X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdolby_doremi_certificate_panel.cc;h=0ad3058c287babf1ba645732f7e63328ece6b415;hp=5a0ce028e646298e50768ae97a34357da82b21e5;hb=746e298e214a65ca9151867b2948560e76b45546;hpb=c0d3ccb11d1bc31767a431c72f99e4a84c26b194

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 5a0ce028e..0ad3058c2 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -38,16 +38,10 @@ 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_TEXT, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog));
-
-	layout ();
 }
 
 static void
@@ -145,14 +139,15 @@ try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial
 }
 
 void
-DolbyDoremiCertificatePanel::do_download (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/";
+	string const prefix = "ftp://ftp.cinema.dolby.com/Certificates/";
 	list<string> urls;
 	list<string> files;
-	string const serial = wx_to_std (_serial->GetValue());
 
 	bool starts_with_digit = false;
 	optional<char> starting_char;
@@ -182,7 +177,7 @@ DolbyDoremiCertificatePanel::do_download (wxStaticText* message)
 	list<string>::const_iterator i = urls.begin ();
 	list<string>::const_iterator j = files.begin ();
 	while (!ok && i != urls.end ()) {
-		optional<string> error = get_from_zip_url (*i++, *j++, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+		optional<string> error = get_from_zip_url (*i++, *j++, true, true, boost::bind (&DownloadCertificatePanel::load_certificate, this, _1));
 		if (error) {
 			errors.push_back (error.get ());
 		} else {
@@ -191,10 +186,10 @@ DolbyDoremiCertificatePanel::do_download (wxStaticText* message)
 	}
 
 	if (ok) {
-		message->SetLabel (_("Certificate downloaded"));
+		_dialog->message()->SetLabel (_("Certificate downloaded"));
 		_dialog->setup_sensitivity ();
 	} else {
-		message->SetLabel (wxT (""));
+		_dialog->message()->SetLabel (wxT (""));
 
 		string s;
 		BOOST_FOREACH (string e, errors) {
@@ -205,12 +200,6 @@ DolbyDoremiCertificatePanel::do_download (wxStaticText* message)
 	}
 }
 
-bool
-DolbyDoremiCertificatePanel::ready_to_download () const
-{
-	return !_serial->IsEmpty ();
-}
-
 wxString
 DolbyDoremiCertificatePanel::name () const
 {