X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdownload_certificate_panel.cc;h=2f3b435efaba5a4f66cc2a72f432ae1a20ad8ea3;hb=8ae2dcecc765df1a98a5dc686473ac46f5e08c3e;hp=7b670261b89d53219c9744d72d46a669d4e7be04;hpb=1a14ae26a73489ae8990bfda1a432d229c3bb2d5;p=dcpomatic.git

diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 7b670261b..2f3b435ef 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -1,32 +1,36 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 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 <dcp/util.h>
 #include <dcp/exceptions.h>
 #include <boost/bind.hpp>
 
 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);
@@ -36,11 +40,13 @@ 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);
 }
@@ -51,13 +57,29 @@ 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()));
+		error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
 	}
 }
 
-dcp::Certificate
+optional<dcp::Certificate>
 DownloadCertificatePanel::certificate () const
 {
-	DCPOMATIC_ASSERT (_certificate);
-	return _certificate.get ();
+	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 ();
 }