X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=8b1f8a03863b2796867559c10390e3220d6ecb3a;hb=8c06e7d56542d16ea6e596056801270bae6d09e6;hp=061d44f4917786bcd22c143ad67bef6eabf14bd9;hpb=278bfa265eed9b2fafec8b2bb5e92541a1bb23c1;p=dcpomatic.git

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 061d44f49..8b1f8a038 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,30 @@
 
 */
 
+
 /** @file  src/wx/about_dialog.cc
  *  @brief The "about DCP-o-matic" dialogue box.
  */
 
 #include "about_dialog.h"
-#include "wx_util.h"
 #include "static_text.h"
-#include "lib/version.h"
+#include "wx_util.h"
 #include "lib/compose.hpp"
+#include "lib/version.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/hyperlink.h>
+LIBDCP_ENABLE_WARNINGS
 
 using std::vector;
 
+
 AboutDialog::AboutDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("About DCP-o-matic"))
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+	auto sizer = new wxBoxSizer (wxVERTICAL);
 
 	wxFont title_font (*wxNORMAL_FONT);
 	title_font.SetPointSize (title_font.GetPointSize() + 12);
@@ -48,7 +53,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	wxFont version_font (*wxNORMAL_FONT);
 	version_font.SetWeight (wxFONTWEIGHT_BOLD);
 
-	wxStaticText* t = new StaticText (this, _("DCP-o-matic"));
+	auto t = new StaticText (this, _("DCP-o-matic"));
 	t->SetFont (title_font);
 	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16));
 
@@ -71,17 +76,17 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
 	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8));
 
-	wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
+	auto 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 StaticText (
 		this,
-		_("(C) 2012-2019 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+		_("(C) 2012-2024 Carl Hetherington, Terrence Meiczinger\nOle Laursen, Aaron Boxer"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
 
@@ -94,21 +99,35 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	written_by.Add (wxT ("Terrence Meiczinger"));
 	written_by.Add (wxT ("Mart Jansink"));
 	written_by.Add (wxT ("Ole Laursen"));
-	written_by.Add (wxT ("Brecht Sanders"));
-	written_by.Add (wxT ("Jianguo Huang"));
+	written_by.Add (wxT ("Aaron Boxer"));
 	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"));
+	with_help_from.Add (wxT ("Lilian Lefranc"));
+	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 ("Gökhan Aksoy"));
 	translated_by.Add (wxT ("Thiago Andre"));
 	translated_by.Add (wxT ("Felice D'Andrea"));
+	translated_by.Add (wxT ("Németh Áron"));
 	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 ("Akivili Collindort"));
 	translated_by.Add (wxT ("Davide Dall'AraCiao"));
+	translated_by.Add (wxT ("Uwe Dittes"));
+	translated_by.Add (wxT ("Михаил Эпштейн"));
 	translated_by.Add (wxT ("William Fanelli"));
 	translated_by.Add (wxT ("Max M. Fuhlendorf"));
 	translated_by.Add (wxT ("Tomáš Hlaváč"));
@@ -118,26 +137,29 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	translated_by.Add (wxT ("Carsten Kurz"));
 	translated_by.Add (wxT ("Lilian Lefranc"));
 	translated_by.Add (wxT ("Gérald Maruccia"));
+	translated_by.Add (wxT ("Mattias Mattsson"));
 	translated_by.Add (wxT ("Mike Mazur"));
 	translated_by.Add (wxT ("Rob van Nieuwkerk"));
 	translated_by.Add (wxT ("Anders Uhl Pedersen"));
+	translated_by.Add (wxT ("David Perrenoud"));
 	translated_by.Add (wxT ("Olivier Perriere"));
 	translated_by.Add (wxT ("Markus Raab"));
+	translated_by.Add (wxT ("Soleyman Rahmani"));
 	translated_by.Add (wxT ("Tiago Casal Ribeiro"));
 	translated_by.Add (wxT ("Davide Sanvito"));
 	translated_by.Add (wxT ("Marek Skrzelowski"));
+	translated_by.Add (wxT ("Danbo Song"));
+	translated_by.Add (wxT ("Martin Srebotnjak"));
+	translated_by.Add (wxT ("Michał Tomaszewski"));
 	translated_by.Add (wxT ("Igor Voytovich"));
 	translated_by.Add (wxT ("Rov (若文)"));
 	translated_by.Add (wxT ("刘汉源"));
- 	add_section (_("Translated by"), translated_by);
+	translated_by.Add (wxT ("poppinzhang"));
+	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 ("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 patrons;
+	patrons.Add ("Lightbender Post");
+	add_section (_("Patrons"), patrons);
 
 	wxArrayString subscribers;
 	#include "subscribers.cc"
@@ -150,13 +172,17 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	wxArrayString tested_by;
 	tested_by.Add (wxT ("Manuel AC"));
 	tested_by.Add (wxT ("Trever Anderson"));
+	tested_by.Add (wxT ("Mohamad W. Ali"));
 	tested_by.Add (wxT ("JP Beauviala"));
 	tested_by.Add (wxT ("Mike Blakesley"));
 	tested_by.Add (wxT ("David Booty"));
+	tested_by.Add (wxT ("Antonio Casado"));
 	tested_by.Add (wxT ("Roop Chand"));
 	tested_by.Add (wxT ("Daniel Chauvet"));
 	tested_by.Add (wxT ("Adam Colt"));
 	tested_by.Add (wxT ("John Convertino"));
+	tested_by.Add (wxT ("Daniel Courville"));
+	tested_by.Add (wxT ("Marek Dudzik"));
 	tested_by.Add (wxT ("Andreas Eli"));
 	tested_by.Add (wxT ("Leo Enticknap"));
 	tested_by.Add (wxT ("Jose Angel Velasco Fernandez"));
@@ -166,6 +192,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	tested_by.Add (wxT ("Steve Guttag"));
 	tested_by.Add (wxT ("Patrick Haderer"));
 	tested_by.Add (wxT ("Bill Hamell"));
+	tested_by.Add (wxT ("Groet Han"));
 	tested_by.Add (wxT ("Jonathan Jensen"));
 	tested_by.Add (wxT ("Thierry Journet"));
 	tested_by.Add (wxT ("Markus Kalb"));
@@ -177,7 +204,9 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	tested_by.Add (wxT ("Denzil Kriekenbeek"));
 	tested_by.Add (wxT ("Carsten Kurz"));
 	tested_by.Add (wxT ("Bill Lam"));
+	tested_by.Add (wxT ("David Lankes"));
 	tested_by.Add (wxT ("Lilian Lefranc"));
+	tested_by.Add (wxT ("Sebastian Leitner"));
 	tested_by.Add (wxT ("Olivier Lemaire"));
 	tested_by.Add (wxT ("Gavin Lewarne"));
 	tested_by.Add (wxT ("Gérald Maruccia"));
@@ -203,9 +232,11 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	tested_by.Add (wxT ("Andreas Weiss"));
 	tested_by.Add (wxT ("Paul Willmott"));
 	tested_by.Add (wxT ("Wolfgang Woehl"));
+	tested_by.Add (wxT ("Benno Zwanenburg"));
+	tested_by.Add (wxT ("Дима Агатов"));
 	add_section (_("Tested by"), tested_by);
 
-	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
+	sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16));
 
 	overall_sizer->Add (sizer);
 
@@ -224,31 +255,32 @@ AboutDialog::AboutDialog (wxWindow* parent)
 void
 AboutDialog::add_section (wxString name, wxArrayString credits)
 {
-	static bool first = true;
-	int const N = 4;
+	static auto first = true;
+	int const N = 3;
 
-	wxScrolledWindow* panel = new wxScrolledWindow (_notebook);
+	auto panel = new wxScrolledWindow (_notebook);
 	panel->SetMaxSize (wxSize (-1, 380));
 	panel->EnableScrolling (false, true);
 	panel->SetScrollRate (0, 32);
-	wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL);
-
-	vector<wxSizer*> sizers;
-
-	for (int i = 0; i < N; ++i) {
-		sizers.push_back (new wxBoxSizer (wxVERTICAL));
-		overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6);
-	}
+	auto overall_sizer = new wxBoxSizer (wxHORIZONTAL);
 
+	vector<wxString> strings(N);
 	int c = 0;
 	for (size_t i = 0; i < credits.Count(); ++i) {
-		add_label_to_sizer (sizers[c], panel, credits[i], false);
+		strings[c] += credits[i] + wxT("\n");
 		++c;
 		if (c == N) {
 			c = 0;
 		}
 	}
 
+	for (int i = 0; i < N; ++i) {
+		auto label = new wxStaticText(panel, wxID_ANY, strings[i]);
+		auto sizer = new wxBoxSizer(wxVERTICAL);
+		sizer->Add(label);
+		overall_sizer->Add(sizer, 1, wxEXPAND | wxALL, 6);
+	}
+
 	panel->SetSizerAndFit (overall_sizer);
 	_notebook->AddPage (panel, name, first);
 	first = false;