Basic pass-through of font information when using DCP subtitles.

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

diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc
index 8509c97d150d502bff9c43be50dc18894be9ec2c..4b5d58b375536c475a26c6612e03bd0ae4c26351 100644 (file)
--- a/src/wx/doremi_certificate_dialog.cc
+++ b/src/wx/doremi_certificate_dialog.cc
@@ -21,11 +21,13 @@
 #include <zip.h>
 #include "lib/compose.hpp"
 #include "lib/util.h"
+#include "lib/ui_signaller.h"
 #include "lib/internet.h"
 #include "doremi_certificate_dialog.h"
 #include "wx_util.h"
 
 using std::string;
+using std::cout;
 using boost::function;
 using boost::optional;
 
@@ -33,7 +35,9 @@ DoremiCertificateDialog::DoremiCertificateDialog (wxWindow* parent, function<voi
        : DownloadCertificateDialog (parent, load)
 {
        add (_("Server serial number"), true);
-       _serial = add (new wxTextCtrl (this, wxID_ANY));
+       _serial = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1)));
+
+       _serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DoremiCertificateDialog::set_sensitivity, this));
 
        add_common_widgets ();
 }
@@ -49,6 +53,19 @@ DoremiCertificateDialog::download ()
 
        _message->SetLabel (_("Downloading certificate"));
 
+#ifdef DCPOMATIC_OSX   
+       /* This is necessary on OS X, otherwise the SetLabel() above has no visible effect */
+       wxMilliSleep (200);
+#endif 
+
+       ui_signaller->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial));
+}
+
+void
+DoremiCertificateDialog::finish_download (string serial)
+{
+       /* Try dcp2000, imb and ims prefixes (see mantis #375) */
+
        optional<string> error = get_from_zip_url (
                String::compose (
                        "ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/dcp2000-%2.dcicerts.zip",
@@ -58,9 +75,38 @@ DoremiCertificateDialog::download ()
                _load
                );
 
+       if (error) {
+               error = get_from_zip_url (
+               String::compose (
+                       "ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/imb-%2.dcicerts.zip",
+                       serial.substr(0, 3), serial
+                       ),
+               String::compose ("imb-%1.cert.sha256.pem", serial),
+               _load
+               );
+       }
+
+       if (error) {
+               error = get_from_zip_url (
+               String::compose (
+                       "ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/ims-%2.dcicerts.zip",
+                       serial.substr(0, 3), serial
+                       ),
+               String::compose ("ims-%1.cert.sha256.pem", serial),
+               _load
+               );
+       }
+
        if (error) {
                error_dialog (this, std_to_wx (error.get ()));
        } else {
-               _message->SetLabel (wxT (""));
+               _message->SetLabel (_("Certificate downloaded"));
        }
 }
+
+void
+DoremiCertificateDialog::set_sensitivity ()
+{
+       _download->Enable (!_serial->IsEmpty ());
+}
+