711c36c150f3efffd64875399ada94baafb87cb1 from master; ok button disabling in download...

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

diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc
index e5bb1896207fe396464624e7ca730093b8d217ab..15551a424a6971dfa0c7419c0a8b9c561a85579d 100644 (file)
--- a/src/wx/dolby_certificate_dialog.cc
+++ b/src/wx/dolby_certificate_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,13 +21,13 @@
 #include <curl/curl.h>
 #include "lib/compose.hpp"
 #include "lib/internet.h"
+#include "lib/ui_signaller.h"
 #include "dolby_certificate_dialog.h"
 #include "wx_util.h"
 
 using std::list;
 using std::string;
 using std::vector;
-using std::stringstream;
 using std::cout;
 using boost::optional;
 using boost::algorithm::split;
@@ -75,8 +75,17 @@ DolbyCertificateDialog::setup_countries ()
        
        _country->Append (_("Fetching..."));
        _country->SetSelection (0);
-       run_gui_loop ();
-       
+
+#ifdef DCPOMATIC_OSX
+       /* See DoremiCertificateDialog for discussion about this daft delay */
+       wxMilliSleep (200);
+#endif
+       ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_setup_countries, this));
+}
+
+void
+DolbyCertificateDialog::finish_setup_countries ()
+{
        list<string> const countries = get_dir ("");
        _country->Clear ();
        for (list<string>::const_iterator i = countries.begin(); i != countries.end(); ++i) {
@@ -90,8 +99,16 @@ DolbyCertificateDialog::country_selected ()
        _cinema->Clear ();
        _cinema->Append (_("Fetching..."));
        _cinema->SetSelection (0);
-       run_gui_loop ();
-       
+
+#ifdef DCPOMATIC_OSX
+       wxMilliSleep (200);
+#endif 
+       ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_country_selected, this));
+}
+
+void
+DolbyCertificateDialog::finish_country_selected ()
+{
        list<string> const cinemas = get_dir (wx_to_std (_country->GetStringSelection()));
        _cinema->Clear ();
        for (list<string>::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
@@ -105,8 +122,16 @@ DolbyCertificateDialog::cinema_selected ()
        _serial->Clear ();
        _serial->Append (_("Fetching..."));
        _serial->SetSelection (0);
-       run_gui_loop ();
 
+#ifdef DCPOMATIC_OSX
+       wxMilliSleep (200);
+#endif
+       ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_cinema_selected, this));
+}
+
+void
+DolbyCertificateDialog::finish_cinema_selected ()
+{
        string const dir = String::compose ("%1/%2", wx_to_std (_country->GetStringSelection()), wx_to_std (_cinema->GetStringSelection()));
        list<string> const zips = get_dir (dir);
 
@@ -129,9 +154,19 @@ DolbyCertificateDialog::serial_selected ()
 void
 DolbyCertificateDialog::download ()
 {
+       downloaded (false);
        _message->SetLabel (_("Downloading certificate"));
-       run_gui_loop ();
 
+#ifdef DCPOMATIC_OSX
+       wxMilliSleep (200);
+#endif
+
+       ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_download, this));
+}
+
+void
+DolbyCertificateDialog::finish_download ()
+{
        string const zip = string_client_data (_serial->GetClientObject (_serial->GetSelection ()));
 
        string const file = String::compose (
@@ -155,5 +190,6 @@ DolbyCertificateDialog::download ()
                _message->SetLabel (std_to_wx (error.get ()));
        } else {
                _message->SetLabel (_("Certificate downloaded"));
+               downloaded (true);
        }
 }