Don't say 'certificate downloaded' if it failed during the read part.

[dcpomatic.git] / src / wx / download_certificate_panel.cc

diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 1379025c66ae1268ae20a086f90d29f9f094dcc3..461c68966cba83b94d3afc27838f073e55fb78ba 100644 (file)
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -1,33 +1,38 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
 #include "wx_util.h"
 #include "download_certificate_panel.h"
+#include "download_certificate_dialog.h"
+#include "lib/signal_manager.h"
+#include "lib/compose.hpp"
 #include <dcp/util.h>
 #include <dcp/exceptions.h>
 #include <boost/bind.hpp>
 
+using std::string;
 using boost::function;
 using boost::optional;
 
-DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog)
-       : wxPanel (parent, wxID_ANY)
+DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* dialog)
+       : wxPanel (dialog->notebook(), wxID_ANY)
        , _dialog (dialog)
 {
        _overall_sizer = new wxBoxSizer (wxVERTICAL);
@@ -37,23 +42,26 @@ DownloadCertificatePanel::DownloadCertificatePanel (wxWindow* parent, DownloadCe
        _table->AddGrowableCol (1, 1);
 
        _overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-}
 
-void
-DownloadCertificatePanel::layout ()
-{
+       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));
+
        _overall_sizer->Layout ();
        _overall_sizer->SetSizeHints (this);
 }
 
-void
+optional<string>
 DownloadCertificatePanel::load (boost::filesystem::path file)
 {
        try {
                _certificate = 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()));
+               return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
        }
+       return optional<string>();
 }
 
 optional<dcp::Certificate>
@@ -61,3 +69,20 @@ DownloadCertificatePanel::certificate () const
 {
        return _certificate;
 }
+
+void
+DownloadCertificatePanel::download ()
+{
+       _dialog->message()->SetLabel (_("Downloading certificate"));
+
+       /* Hack: without this the SetLabel() above has no visible effect */
+       wxMilliSleep (200);
+
+       signal_manager->when_idle (boost::bind (&DownloadCertificatePanel::do_download, this));
+}
+
+bool
+DownloadCertificatePanel::ready_to_download () const
+{
+       return !_serial->IsEmpty ();
+}