diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-05 15:25:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-06 10:29:24 +0100 |
| commit | a713e8258acc3f0e960c4e87ba8684902d29a591 (patch) | |
| tree | 4023978fc160f8e75ced0b8be1e13b7dea452aa3 /src/wx/barco_alchemy_certificate_panel.cc | |
| parent | c9772ea0129d59e84cc85cd3908e712b5df56970 (diff) | |
Move credentials settings into certificate download dialogue (#1480).
Diffstat (limited to 'src/wx/barco_alchemy_certificate_panel.cc')
| -rw-r--r-- | src/wx/barco_alchemy_certificate_panel.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc index 84048c65c..47dd85e07 100644 --- a/src/wx/barco_alchemy_certificate_panel.cc +++ b/src/wx/barco_alchemy_certificate_panel.cc @@ -29,7 +29,15 @@ using std::string; using boost::optional; BarcoAlchemyCertificatePanel::BarcoAlchemyCertificatePanel (DownloadCertificateDialog* dialog) - : DownloadCertificatePanel (dialog) + : CredentialsDownloadCertificatePanel ( + dialog, + boost::bind(&Config::barco_username, Config::instance()), + boost::bind(&Config::set_barco_username, Config::instance(), _1), + boost::bind(&Config::unset_barco_username, Config::instance()), + boost::bind(&Config::barco_password, Config::instance()), + boost::bind(&Config::set_barco_password, Config::instance(), _1), + boost::bind(&Config::unset_barco_password, Config::instance()) + ) { } @@ -37,19 +45,12 @@ BarcoAlchemyCertificatePanel::BarcoAlchemyCertificatePanel (DownloadCertificateD bool BarcoAlchemyCertificatePanel::ready_to_download () const { - return _serial->GetValue().Length() == 10; + return CredentialsDownloadCertificatePanel::ready_to_download() && _serial->GetValue().Length() == 10; } void BarcoAlchemyCertificatePanel::do_download () { - Config* config = Config::instance (); - if (!config->barco_username() || !config->barco_password()) { - _dialog->message()->SetLabel(wxT("")); - error_dialog (this, _("No Barco username/password configured. Add your account details to the Accounts page in Preferences.")); - return; - } - string const serial = wx_to_std (_serial->GetValue()); string const url = String::compose ( "ftp://%1:%2@certificates.barco.com/%3xxx/%4/Barco-ICMP.%5_cert.pem", |