X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=73c569282621c11f8c1a167e999e703ac972bcda;hb=1905ef29b005f501c91c0537b6a6e723bf87d1ac;hp=4f58b2d1882a6cd8383871592483cf6bd443e9f5;hpb=475cc7a5ef77484c43ad785dbec6a0713ba1e618;p=dcpomatic.git

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 4f58b2d18..73c569282 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -27,16 +27,19 @@
 #include "static_text.h"
 #include "lib/version.h"
 #include "lib/compose.hpp"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/hyperlink.h>
+DCPOMATIC_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 +51,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,7 +74,7 @@ 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 ("https://dcpomatic.com")
@@ -81,7 +84,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
 	t = new StaticText (
 		this,
-		_("(C) 2012-2020 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+		_("(C) 2012-2021 Carl Hetherington, Terrence Meiczinger\n Ole Laursen"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
 
@@ -94,8 +97,6 @@ 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"));
 	add_section (_("Written by"), written_by);
 
 	wxArrayString with_help_from;
@@ -104,6 +105,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	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;
@@ -127,6 +129,7 @@ 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"));
@@ -176,6 +179,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"));
@@ -216,7 +220,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	tested_by.Add (wxT ("Wolfgang Woehl"));
 	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);
 
@@ -235,14 +239,14 @@ AboutDialog::AboutDialog (wxWindow* parent)
 void
 AboutDialog::add_section (wxString name, wxArrayString credits)
 {
-	static bool first = true;
+	static auto first = true;
 	int const N = 4;
 
-	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);
+	auto overall_sizer = new wxBoxSizer (wxHORIZONTAL);
 
 	vector<wxSizer*> sizers;