X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=a40cd87c0ebe2f9a6ccf1a1c5f98806c2fe04bb1;hp=b3e68f4d1e9e2b28a45ecab31dd1d4c8b398009c;hb=eb3301dbdf655a36c98f50eb9b4adcfe4d1dad0c;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index b3e68f4d1..a40cd87c0 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2020 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,28 +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/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include "lib/version.h" +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +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); @@ -51,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)); @@ -74,7 +76,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") @@ -84,7 +86,7 @@ AboutDialog::AboutDialog (wxWindow* parent) t = new StaticText ( this, - _("(C) 2012-2020 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), + _("(C) 2012-2023 Carl Hetherington, Terrence Meiczinger\n Ole Laursen"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); @@ -97,8 +99,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; @@ -107,13 +107,16 @@ 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; 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")); @@ -121,6 +124,8 @@ 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 ("Михаил Эпштейн")); translated_by.Add (wxT ("William Fanelli")); translated_by.Add (wxT ("Max M. Fuhlendorf")); translated_by.Add (wxT ("Tomáš Hlaváč")); @@ -130,19 +135,23 @@ 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 ("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 ("刘汉源")); - translated_by.Add (wxT ("Gökhan Aksoy")); - add_section (_("Translated by"), translated_by); + add_section (_("Translated by"), translated_by); wxArrayString patrons; patrons.Add ("Luproduction"); @@ -162,6 +171,7 @@ 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")); @@ -170,6 +180,8 @@ AboutDialog::AboutDialog (wxWindow* parent) 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")); @@ -179,6 +191,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")); @@ -190,6 +203,7 @@ 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")); @@ -219,7 +233,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); @@ -238,14 +252,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;