diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-14 21:11:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-14 21:11:09 +0100 |
| commit | a09fa32118828d2af282566e94aacd7f153b8643 (patch) | |
| tree | c0c4841c284b4f79aa6f2c66a6d72555c4dd5b96 | |
| parent | 4ff0e7ddb7580e91892075f6f11e2ef6d29578d6 (diff) | |
Add subscribers in their own part of the about box.
| -rw-r--r-- | src/wx/about_dialog.cc | 6 | ||||
| -rw-r--r-- | wscript | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 2461e7bbb..1a4513a74 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -137,9 +137,13 @@ AboutDialog::AboutDialog (wxWindow* parent) with_help_from.Add (wxT ("Julian van Mil")); add_section (_("With help from"), with_help_from); + wxArrayString subscribers; + #include "subscribers.cc" + add_section (_("Subscribers"), subscribers); + wxArrayString supported_by; #include "supporters.cc" - add_section (_("Supported by"), supported_by); + add_section (_("Also supported by"), supported_by); wxArrayString tested_by; tested_by.Add (wxT ("Manuel AC")); @@ -609,9 +609,11 @@ def configure(conf): def download_supporters(can_fail): last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0] - r = os.system('curl -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()})) + r = os.system('curl -s -f https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()})) + if (r >> 8) == 0: + r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc?%s > src/wx/subscribers.cc' % urlencode({"until": last_date.strip()})) if (r >> 8) != 0 and can_fail: - raise Exception("Could not download supporters list") + raise Exception("Could not download supporters lists") def build(bld): create_version_cc(VERSION, bld.env.CXXFLAGS) |