X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=9ec41d7d36d3702f44d0877e3407ba9d266a7e80;hp=d34c351fe488be29cd98f214ad18095de59be128;hb=f10e025eba54b0ab4dbe1b3611071b160ca89208;hpb=fbdefe5be361c73a463c3bbe27a7e93a422435b3

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index d34c351fe..9ec41d7d3 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,7 @@
 
 #include "about_dialog.h"
 #include "wx_util.h"
+#include "static_text.h"
 #include "lib/version.h"
 #include "lib/compose.hpp"
 #include <wx/notebook.h>
@@ -47,22 +48,22 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	wxFont version_font (*wxNORMAL_FONT);
 	version_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-	wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DCP-o-matic"));
+	wxStaticText* t = new StaticText (this, _("DCP-o-matic"));
 	t->SetFont (title_font);
 	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16));
 
 	wxString s;
 	if (strcmp (dcpomatic_git_commit, "release") == 0) {
-		t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1", dcpomatic_version)));
+		t = new StaticText (this, std_to_wx(String::compose("Version %1", dcpomatic_version)));
 	} else {
-		t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
+		t = new StaticText (this, std_to_wx(String::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
 	}
 	t->SetFont (version_font);
 	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2));
 	sizer->AddSpacer (12);
 
-	t = new wxStaticText (
-		this, wxID_ANY,
+	t = new StaticText (
+		this,
 		_("Free, open-source DCP creation from almost anything."),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
@@ -73,14 +74,14 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
 		this, wxID_ANY,
 		wxT ("dcpomatic.com"),
-		wxT ("http://dcpomatic.com")
+		wxT ("https://dcpomatic.com")
 		);
 
 	sizer->Add (h, wxSizerFlags().Centre().Border(wxALL, 8));
 
-	t = new wxStaticText (
-		this, wxID_ANY,
-		_("(C) 2012-2018 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+	t = new StaticText (
+		this,
+		_("(C) 2012-2020 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
 
@@ -97,15 +98,25 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	written_by.Add (wxT ("Jianguo Huang"));
 	add_section (_("Written by"), written_by);
 
+	wxArrayString with_help_from;
+	with_help_from.Add (wxT ("David Vignoni"));
+	with_help_from.Add (wxT ("Dennis Couzin"));
+	with_help_from.Add (wxT ("Carsten Kurz"));
+	with_help_from.Add (wxT ("Gérald Maruccia"));
+	with_help_from.Add (wxT ("Julian van Mil"));
+	add_section (_("With help from"), with_help_from);
+
 	wxArrayString translated_by;
 	translated_by.Add (wxT ("Manuel AC"));
 	translated_by.Add (wxT ("Max Aeschlimann"));
 	translated_by.Add (wxT ("Thiago Andre"));
+	translated_by.Add (wxT ("Felice D'Andrea"));
 	translated_by.Add (wxT ("Grégoire Ausina"));
 	translated_by.Add (wxT ("Tomáš Begeni"));
 	translated_by.Add (wxT ("Fabio \"Zak\" Belli"));
 	translated_by.Add (wxT ("Cherif Ben Brahim"));
 	translated_by.Add (wxT ("Massimiliano Broggi"));
+	translated_by.Add (wxT ("Dan Cohen"));
 	translated_by.Add (wxT ("Davide Dall'AraCiao"));
 	translated_by.Add (wxT ("William Fanelli"));
 	translated_by.Add (wxT ("Max M. Fuhlendorf"));
@@ -127,18 +138,22 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	translated_by.Add (wxT ("Igor Voytovich"));
 	translated_by.Add (wxT ("Rov (若文)"));
 	translated_by.Add (wxT ("刘汉源"));
+	translated_by.Add (wxT ("Gökhan Aksoy"));
  	add_section (_("Translated by"), translated_by);
 
-	wxArrayString with_help_from;
-	with_help_from.Add (wxT ("David Vignoni"));
-	with_help_from.Add (wxT ("Dennis Couzin"));
-	with_help_from.Add (wxT ("Gérald Maruccia"));
-	with_help_from.Add (wxT ("Julian van Mil"));
-	add_section (_("With help from"), with_help_from);
+	wxArrayString patrons;
+	patrons.Add ("Luproduction");
+	patrons.Add ("Lightbender Post");
+	patrons.Add ("Drop-out Cinema");
+	add_section (_("Patrons"), patrons);
+
+	wxArrayString subscribers;
+	#include "subscribers.cc"
+	add_section (_("Subscribers"), subscribers);
 
 	wxArrayString supported_by;
-	#include "../../build/supporters.cc"
-	add_section (_("Supported by"), supported_by);
+	#include "supporters.cc"
+	add_section (_("Also supported by"), supported_by);
 
 	wxArrayString tested_by;
 	tested_by.Add (wxT ("Manuel AC"));