X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=c4167c7e7472215260de71c773b17390cb21b7d1;hb=f984990795e548e2c4160d17d0fa54a40c8b1311;hp=9e790dacbb32c24db727d02549a825fb9fc0a692;hpb=ee83945f23b5d9c3ec06f0658a7ccca14a2c7890;p=dcpomatic.git diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 9e790dacb..c4167c7e7 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2019 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington 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 #include +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-2019 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; @@ -118,6 +120,7 @@ AboutDialog::AboutDialog (wxWindow* parent) translated_by.Add (wxT ("Massimiliano Broggi")); translated_by.Add (wxT ("Dan Cohen")); translated_by.Add (wxT ("Davide Dall'AraCiao")); + translated_by.Add (wxT ("Uwe Dittes")); translated_by.Add (wxT ("William Fanelli")); translated_by.Add (wxT ("Max M. Fuhlendorf")); translated_by.Add (wxT ("Tomáš Hlaváč")); @@ -127,6 +130,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")); @@ -141,6 +145,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 +166,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")); @@ -168,6 +180,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")); @@ -180,6 +193,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 +221,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 +240,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 sizers;