diff options
| -rw-r--r-- | src/wx/dolby_certificate_dialog.cc | 10 | ||||
| -rw-r--r-- | src/wx/doremi_certificate_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/screen_dialog.cc | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc index 9960c16c9..e5bb18962 100644 --- a/src/wx/dolby_certificate_dialog.cc +++ b/src/wx/dolby_certificate_dialog.cc @@ -135,7 +135,7 @@ DolbyCertificateDialog::download () string const zip = string_client_data (_serial->GetClientObject (_serial->GetSelection ())); string const file = String::compose ( - "%1/%2/%3", + "ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1/%2/%3", wx_to_std (_country->GetStringSelection()), wx_to_std (_cinema->GetStringSelection()), zip @@ -149,11 +149,11 @@ DolbyCertificateDialog::download () return; } string const cert = b[0] + "_" + b[1] + ".pem.crt"; - + optional<string> error = get_from_zip_url (file, cert, _load); if (error) { - error_dialog (this, std_to_wx (error.get ())); + _message->SetLabel (std_to_wx (error.get ())); + } else { + _message->SetLabel (_("Certificate downloaded")); } - - _message->SetLabel (wxT ("")); } diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc index 766318990..b0840a83f 100644 --- a/src/wx/doremi_certificate_dialog.cc +++ b/src/wx/doremi_certificate_dialog.cc @@ -64,7 +64,7 @@ DoremiCertificateDialog::download () if (error) { error_dialog (this, std_to_wx (error.get ())); } else { - _message->SetLabel (wxT ("Certificate downloaded")); + _message->SetLabel (_("Certificate downloaded")); } } diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 232afa33c..b702ae0ad 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -120,6 +120,8 @@ ScreenDialog::download_certificate () d->ShowModal (); d->Destroy (); } + + setup_sensitivity (); } void |