X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=9409de5a8d94014470bc5908e4d622b10375794f;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=c8860f7ba806659950f488e07b532632e70800cd;hpb=34a335c9f17e736de4aaa136b9d799616d7b73ae;p=dcpomatic.git diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index c8860f7ba..9409de5a8 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-2016 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 . */ @@ -21,12 +22,12 @@ * @brief The "about DCP-o-matic" dialogue box. */ -#include -#include -#include "lib/version.h" -#include "lib/compose.hpp" #include "about_dialog.h" #include "wx_util.h" +#include "lib/version.h" +#include "lib/compose.hpp" +#include +#include using std::vector; @@ -79,7 +80,7 @@ AboutDialog::AboutDialog (wxWindow* parent) t = new wxStaticText ( this, wxID_ANY, - _("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), + _("(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); @@ -98,20 +99,30 @@ AboutDialog::AboutDialog (wxWindow* parent) 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 ("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 ("Davide Dall'AraCiao")); translated_by.Add (wxT ("William Fanelli")); + 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 ("Rob van Nieuwkerk")); + translated_by.Add (wxT ("Anders Uhl Pedersen")); 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 ("Igor Voytovich")); + translated_by.Add (wxT ("Rov (若文)")); add_section (_("Translated by"), translated_by); wxArrayString with_help_from; @@ -127,67 +138,111 @@ AboutDialog::AboutDialog (wxWindow* parent) 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 ("Paul Carey")); supported_by.Add (wxT ("Kieran Carroll")); + supported_by.Add (wxT ("Nathan Carpenter")); 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 ("JP Davidson")); + supported_by.Add (wxT ("Yohann Dedy")); 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 ("Gerhard Gruber")); 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 ("Film.Ca Inc.")); + supported_by.Add (wxT ("Denis Ivashvkevych")); + supported_by.Add (wxT ("Karl Jacob")); supported_by.Add (wxT ("Jonathan Jensen")); + supported_by.Add (wxT ("Thierry Journet")); + supported_by.Add (wxT ("Mario Kalogjera")); + 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 ("Mandorla")); + supported_by.Add (wxT ("Gerard Manshanden")); + supported_by.Add (wxT ("Daniel Martinez Lara")); + supported_by.Add (wxT ("Stefan Massopust")); + supported_by.Add (wxT ("Michal Moc")); + supported_by.Add (wxT ("David Armati Lechner")); 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 ("Juan Marin Lorenzo")); supported_by.Add (wxT ("Adrian Manolescu")); supported_by.Add (wxT ("Mattias Mattsson")); + supported_by.Add (wxT ("George Mazarakis")); + supported_by.Add (wxT ("Gordon McLeod")); 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 ("NT Next")); supported_by.Add (wxT ("David Nedrow")); + supported_by.Add (wxT ("Casablanca Nuernberg")); + supported_by.Add (wxT ("Pascal Nussbaum")); supported_by.Add (wxT ("Tim O'Brien")); supported_by.Add (wxT ("Jerome Cohen Olivar")); + supported_by.Add (wxT ("Tito Oliveira")); supported_by.Add (wxT ("Kevin Orman")); supported_by.Add (wxT ("Rui Pereira")); + supported_by.Add (wxT ("Denis Postle")); + supported_by.Add (wxT ("Aditya Pratama")); + supported_by.Add (wxT ("Ceridwen Productions")); supported_by.Add (wxT ("Ivan Pullman")); + supported_by.Add (wxT ("Desiderio Garcia Ramirez")); + supported_by.Add (wxT ("Steve Reverand")); 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 ("Gregg Smith")); + 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 ("Tomislav Stojanović")); + supported_by.Add (wxT ("Christian Suhren")); supported_by.Add (wxT ("Bruce Taylor")); + supported_by.Add (wxT ("OpsCenter Technologies, Inc.")); supported_by.Add (wxT ("Lawrence Towers")); supported_by.Add (wxT ("Richard Turner")); + supported_by.Add (wxT ("Stéphane Wagneur")); 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")); @@ -195,6 +250,7 @@ AboutDialog::AboutDialog (wxWindow* parent) 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 ("Mobiles Kino e.V.")); supported_by.Add (wxT ("Daniel Židek")); supported_by.Add (wxT ("Гуляев Михаил")); add_section (_("Supported by"), supported_by); @@ -208,6 +264,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")); @@ -234,6 +291,7 @@ AboutDialog::AboutDialog (wxWindow* parent) 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")); @@ -242,6 +300,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Greg Rooke")); tested_by.Add (wxT ("Elad Saad")); tested_by.Add (wxT ("Karim Senoucci")); + tested_by.Add (wxT ("Hordur Valgardsson")); tested_by.Add (wxT ("Simon Vannarath")); tested_by.Add (wxT ("Igor Voytovich")); tested_by.Add (wxT ("Andrew Walls")); @@ -270,9 +329,12 @@ void AboutDialog::add_section (wxString name, wxArrayString credits) { static bool first = true; - int const N = 3; + 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;