From: Carl Hetherington <cth@carlh.net>
Date: Tue, 14 Aug 2018 20:11:09 +0000 (+0100)
Subject: Add subscribers in their own part of the about box.
X-Git-Tag: v2.13.43~28
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=a09fa32118828d2af282566e94aacd7f153b8643

Add subscribers in their own part of the about box.
---

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"));
diff --git a/wscript b/wscript
index 755f300a1..27f06f8a1 100644
--- a/wscript
+++ b/wscript
@@ -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)