More c++ tidying.

[dcpomatic.git] / src / wx / about_dialog.cc

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index d5a3697918c9828bc6662247031242c2487dba7e..5c13be5514aefc8014336109c9ff341fbc45a109 100644 (file)
--- 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.
 
@@ -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,17 +74,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-2021 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
 
@@ -141,6 +144,13 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Gökhan Aksoy"));
        add_section (_("Translated by"), translated_by);
 
+       wxArrayString patrons;
+       patrons.Add ("Luproduction");
+       patrons.Add ("Lightbender Post");
+       patrons.Add ("Drop-out Cinema");
+       patrons.Add ("Pilotkino LLC");
+       add_section (_("Patrons"), patrons);
+
        wxArrayString subscribers;
        #include "subscribers.cc"
        add_section (_("Subscribers"), subscribers);
@@ -155,6 +165,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        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"));
@@ -180,6 +191,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Carsten Kurz"));
        tested_by.Add (wxT ("Bill Lam"));
        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"));
@@ -207,7 +219,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);
 
@@ -226,14 +238,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;