X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdoremi_certificate_dialog.cc;h=c4c2115f04e6de01e219caaa6ae1e237e33418a8;hb=39dc4e1aabc40f600d358a6d023e82b75f024679;hp=4b5d58b375536c475a26c6612e03bd0ae4c26351;hpb=6788ff5967508056d1321c16143bf72fa7cd4516;p=dcpomatic.git diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc index 4b5d58b37..c4c2115f0 100644 --- a/src/wx/doremi_certificate_dialog.cc +++ b/src/wx/doremi_certificate_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington 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,10 +21,11 @@ #include #include "lib/compose.hpp" #include "lib/util.h" -#include "lib/ui_signaller.h" +#include "lib/signal_manager.h" #include "lib/internet.h" #include "doremi_certificate_dialog.h" #include "wx_util.h" +#include using std::string; using std::cout; @@ -51,14 +52,15 @@ DoremiCertificateDialog::download () return; } + downloaded (false); _message->SetLabel (_("Downloading certificate")); -#ifdef DCPOMATIC_OSX +#ifdef DCPOMATIC_OSX /* This is necessary on OS X, otherwise the SetLabel() above has no visible effect */ wxMilliSleep (200); -#endif +#endif - ui_signaller->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial)); + signal_manager->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial)); } void @@ -101,6 +103,7 @@ DoremiCertificateDialog::finish_download (string serial) error_dialog (this, std_to_wx (error.get ())); } else { _message->SetLabel (_("Certificate downloaded")); + downloaded (true); } }