projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename certificate -> recipient in Screen.
[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 4b5d58b375536c475a26c6612e03bd0ae4c26351..ffb2a0f99c05f07917cbadd28ac8df970ea48481 100644
(file)
--- a/
src/wx/doremi_certificate_dialog.cc
+++ b/
src/wx/doremi_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
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 <zip.h>
#include "lib/compose.hpp"
#include "lib/util.h"
#include <zip.h>
#include "lib/compose.hpp"
#include "lib/util.h"
-#include "lib/
ui_signall
er.h"
+#include "lib/
signal_manag
er.h"
#include "lib/internet.h"
#include "doremi_certificate_dialog.h"
#include "wx_util.h"
#include "lib/internet.h"
#include "doremi_certificate_dialog.h"
#include "wx_util.h"
+#include <iostream>
using std::string;
using std::cout;
using std::string;
using std::cout;
@@
-51,14
+52,13
@@
DoremiCertificateDialog::download ()
return;
}
return;
}
+ downloaded (false);
_message->SetLabel (_("Downloading certificate"));
_message->SetLabel (_("Downloading certificate"));
-#ifdef DCPOMATIC_OSX
- /* This is necessary on OS X, otherwise the SetLabel() above has no visible effect */
+ /* Hack: without this the SetLabel() above has no visible effect */
wxMilliSleep (200);
wxMilliSleep (200);
-#endif
-
ui_signall
er->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial));
+
signal_manag
er->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial));
}
void
}
void
@@
-98,9
+98,11
@@
DoremiCertificateDialog::finish_download (string serial)
}
if (error) {
}
if (error) {
+ _message->SetLabel (wxT (""));
error_dialog (this, std_to_wx (error.get ()));
} else {
_message->SetLabel (_("Certificate downloaded"));
error_dialog (this, std_to_wx (error.get ()));
} else {
_message->SetLabel (_("Certificate downloaded"));
+ downloaded (true);
}
}
}
}
@@
-109,4
+111,3
@@
DoremiCertificateDialog::set_sensitivity ()
{
_download->Enable (!_serial->IsEmpty ());
}
{
_download->Enable (!_serial->IsEmpty ());
}
-