X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=7fb65fcab615b3edce3f6825fc12ffd04aaf957b;hp=3fffca0396ebbaf7dd2da182a0d86ebb3025c878;hb=b93430a73313d705f7f51315db705cfcf9942297;hpb=f7ebd3343016172142e254ea014967f193e9861d diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 3fffca039..18cf2981c 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -23,6 +24,7 @@ #include "about_dialog.h" #include "wx_util.h" +#include "static_text.h" #include "lib/version.h" #include "lib/compose.hpp" #include @@ -46,22 +48,22 @@ AboutDialog::AboutDialog (wxWindow* parent) wxFont version_font (*wxNORMAL_FONT); version_font.SetWeight (wxFONTWEIGHT_BOLD); - wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DCP-o-matic")); + wxStaticText* t = new StaticText (this, _("DCP-o-matic")); t->SetFont (title_font); sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16)); wxString s; if (strcmp (dcpomatic_git_commit, "release") == 0) { - t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1", dcpomatic_version))); + t = new StaticText (this, std_to_wx(String::compose("Version %1", dcpomatic_version))); } else { - t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit))); + t = new StaticText (this, std_to_wx(String::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit))); } t->SetFont (version_font); sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2)); sizer->AddSpacer (12); - t = new wxStaticText ( - this, wxID_ANY, + t = new StaticText ( + this, _("Free, open-source DCP creation from almost anything."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); @@ -72,14 +74,14 @@ AboutDialog::AboutDialog (wxWindow* parent) wxHyperlinkCtrl* 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 wxStaticText ( - this, wxID_ANY, - _("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), + t = new StaticText ( + this, + _("(C) 2012-2019 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); @@ -90,25 +92,43 @@ AboutDialog::AboutDialog (wxWindow* parent) wxArrayString written_by; written_by.Add (wxT ("Carl Hetherington")); 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; + 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 translated_by; translated_by.Add (wxT ("Manuel AC")); translated_by.Add (wxT ("Max Aeschlimann")); + translated_by.Add (wxT ("Thiago Andre")); + translated_by.Add (wxT ("Felice D'Andrea")); 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 ("Davide Dall'AraCiao")); translated_by.Add (wxT ("William Fanelli")); + translated_by.Add (wxT ("Max M. Fuhlendorf")); + translated_by.Add (wxT ("Tomáš Hlaváč")); translated_by.Add (wxT ("Thierry Journet")); translated_by.Add (wxT ("Adam Klotblixt")); translated_by.Add (wxT ("Theo Kooijmans")); translated_by.Add (wxT ("Carsten Kurz")); translated_by.Add (wxT ("Lilian Lefranc")); translated_by.Add (wxT ("Gérald Maruccia")); + translated_by.Add (wxT ("Mike Mazur")); + translated_by.Add (wxT ("Rob van Nieuwkerk")); translated_by.Add (wxT ("Anders Uhl Pedersen")); translated_by.Add (wxT ("Olivier Perriere")); translated_by.Add (wxT ("Markus Raab")); @@ -116,111 +136,30 @@ AboutDialog::AboutDialog (wxWindow* parent) translated_by.Add (wxT ("Davide Sanvito")); translated_by.Add (wxT ("Marek Skrzelowski")); translated_by.Add (wxT ("Igor Voytovich")); - translated_by.Add (wxT ("Rob van Nieuwkerk")); - 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 ("Gérald Maruccia")); - add_section (_("With help from"), with_help_from); + translated_by.Add (wxT ("Rov (若文)")); + translated_by.Add (wxT ("刘汉源")); + 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); wxArrayString supported_by; - supported_by.Add (wxT ("Manuel AC")); - supported_by.Add (wxT ("Kambiz Afshar")); - supported_by.Add (wxT ("Alex Asp")); - supported_by.Add (wxT ("Eric Audurier")); - supported_by.Add (wxT ("Louis Belloisy")); - supported_by.Add (wxT ("Mike Blakesley")); - supported_by.Add (wxT ("Silvio Bonomi")); - supported_by.Add (wxT ("Jeff Boot")); - supported_by.Add (wxT ("Kieran Carroll")); - supported_by.Add (wxT ("Matt Carter")); - supported_by.Add (wxT ("Frank Cianciolo")); - supported_by.Add (wxT ("Cinema Clarici")); - supported_by.Add (wxT ("Adam Colt")); - supported_by.Add (wxT ("Adam Cousins")); - supported_by.Add (wxT ("Matthias Damm")); - supported_by.Add (wxT ("Alexey Derevyanko")); - supported_by.Add (wxT ("Thomas Dickens")); - supported_by.Add (wxT ("Unwana Essien")); - supported_by.Add (wxT ("Maxime Estoppey")); - supported_by.Add (wxT ("Rasitha Ferdinando")); - supported_by.Add (wxT ("Jose Angel Velasco Fernandez")); - supported_by.Add (wxT ("Traverso City Film Festival")); - supported_by.Add (wxT ("Andres Fink")); - supported_by.Add (wxT ("Dave Fleegel")); - supported_by.Add (wxT ("Evan Freeze")); - supported_by.Add (wxT ("Silvio Giuliano")); - supported_by.Add (wxT ("Alan Gouger")); - supported_by.Add (wxT ("Christopher Gray")); - supported_by.Add (wxT ("Vincent Grenier")); - supported_by.Add (wxT ("Flor Guillaume")); - supported_by.Add (wxT ("Patrick Haderer")); - supported_by.Add (wxT ("Jeff Hemingway")); - supported_by.Add (wxT ("Antonio Ruiz Hernandez")); - supported_by.Add (wxT ("Jonathan Jensen")); - supported_by.Add (wxT ("Zbigniew Kamiński")); - supported_by.Add (wxT ("Chris Kay")); - supported_by.Add (wxT ("Lars Kelto")); - supported_by.Add (wxT ("Erwan Kerzanet")); - supported_by.Add (wxT ("Kert Kiima")); - supported_by.Add (wxT ("Adam Klotblixt")); - supported_by.Add (wxT ("Filip Kovcin")); - supported_by.Add (wxT ("Cihan Kulaber")); - supported_by.Add (wxT ("Carsten Kurz")); - supported_by.Add (wxT ("Daniel Martinez Lara")); - supported_by.Add (wxT ("Lilian Lefranc")); - supported_by.Add (wxT ("Sean Leigh")); - supported_by.Add (wxT ("Olivier Lemaire")); - supported_by.Add (wxT ("Gavin Lewarne")); - supported_by.Add (wxT ("Theo Lipfert")); - supported_by.Add (wxT ("Paweł Lipiński")); - supported_by.Add (wxT ("Adrian Manolescu")); - supported_by.Add (wxT ("Mattias Mattsson")); - supported_by.Add (wxT ("Kjarten Michaelsen")); - supported_by.Add (wxT ("Aldo Midali")); - supported_by.Add (wxT ("Sylvain Mielle")); - supported_by.Add (wxT ("Howard Molton")); - supported_by.Add (wxT ("Lindsay Morris")); - supported_by.Add (wxT ("David Nedrow")); - supported_by.Add (wxT ("Casablanca Nuernberg")); - supported_by.Add (wxT ("Tim O'Brien")); - supported_by.Add (wxT ("Jerome Cohen Olivar")); - supported_by.Add (wxT ("Kevin Orman")); - supported_by.Add (wxT ("Rui Pereira")); - supported_by.Add (wxT ("Ceridwen Productions")); - supported_by.Add (wxT ("Ivan Pullman")); - supported_by.Add (wxT ("Mark Rolfe")); - supported_by.Add (wxT ("David Rozenthal")); - supported_by.Add (wxT ("Lasse Salling")); - supported_by.Add (wxT ("Jussi Siponen")); - supported_by.Add (wxT ("Peter Sprenger")); - supported_by.Add (wxT ("Randy Stankey")); - supported_by.Add (wxT ("Andrä Steiner")); - supported_by.Add (wxT ("Mike Stiebing")); - supported_by.Add (wxT ("Christian Suhren")); - supported_by.Add (wxT ("Bruce Taylor")); - supported_by.Add (wxT ("Lawrence Towers")); - supported_by.Add (wxT ("Richard Turner")); - supported_by.Add (wxT ("Andrew Walls")); - supported_by.Add (wxT ("Raoul Walzer")); - supported_by.Add (wxT ("Wolfram Weber")); - supported_by.Add (wxT ("Frank Wenz")); - supported_by.Add (wxT ("Anja Wenz")); - supported_by.Add (wxT ("Johannes Wilbrand")); - supported_by.Add (wxT ("Roland Wirtz")); - supported_by.Add (wxT ("Wolfgang Woehl")); - supported_by.Add (wxT ("Frank de Wulf")); - supported_by.Add (wxT ("Pavel Zhdanko")); - supported_by.Add (wxT ("Cinéma de la Neuveville")); - supported_by.Add (wxT ("Frechen-Film e.V.")); - supported_by.Add (wxT ("Daniel Židek")); - supported_by.Add (wxT ("Гуляев Михаил")); - add_section (_("Supported by"), supported_by); + #include "supporters.cc" + add_section (_("Also supported by"), supported_by); wxArrayString tested_by; + tested_by.Add (wxT ("Manuel AC")); tested_by.Add (wxT ("Trever Anderson")); + tested_by.Add (wxT ("JP Beauviala")); tested_by.Add (wxT ("Mike Blakesley")); tested_by.Add (wxT ("David Booty")); tested_by.Add (wxT ("Roop Chand")); @@ -228,6 +167,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Adam Colt")); tested_by.Add (wxT ("John Convertino")); tested_by.Add (wxT ("Andreas Eli")); + tested_by.Add (wxT ("Leo Enticknap")); tested_by.Add (wxT ("Jose Angel Velasco Fernandez")); tested_by.Add (wxT ("Maurizio Giampà")); tested_by.Add (wxT ("Luke Granger-Brown")); @@ -250,10 +190,12 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Olivier Lemaire")); tested_by.Add (wxT ("Gavin Lewarne")); tested_by.Add (wxT ("Gérald Maruccia")); + tested_by.Add (wxT ("George Mazarakis")); tested_by.Add (wxT ("Mattias Mattsson")); tested_by.Add (wxT ("Will Meadows")); tested_by.Add (wxT ("Brad Miller")); tested_by.Add (wxT ("Ash Mitchell")); + tested_by.Add (wxT ("Rob van Nieuwkerk")); tested_by.Add (wxT ("Anders Nordentoft-Madsen")); tested_by.Add (wxT ("Mauro Ottonello")); tested_by.Add (wxT ("Peter Puchner")); @@ -263,6 +205,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Elad Saad")); tested_by.Add (wxT ("Karim Senoucci")); tested_by.Add (wxT ("Hordur Valgardsson")); + tested_by.Add (wxT ("Xenophon the Vampire")); tested_by.Add (wxT ("Simon Vannarath")); tested_by.Add (wxT ("Igor Voytovich")); tested_by.Add (wxT ("Andrew Walls")); @@ -293,7 +236,10 @@ AboutDialog::add_section (wxString name, wxArrayString credits) static bool first = true; int const N = 4; - wxPanel* panel = new wxPanel (_notebook, wxID_ANY); + wxScrolledWindow* panel = new wxScrolledWindow (_notebook); + panel->SetMaxSize (wxSize (-1, 380)); + panel->EnableScrolling (false, true); + panel->SetScrollRate (0, 32); wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL); vector sizers;