X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=74ffd3613f10e393343df5b3de3520abda912327;hb=a6c2a77c2728e420f7ffdd5bb1a3974ca82b8a0c;hp=3f0a1056c9dc21193cfea31cbbe00691bec82838;hpb=c06df9e7bbd0f13d1355816b80f1a5d3ec1231b0;p=dcpomatic.git diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 3f0a1056c..0d488ddf8 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-2017 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; @@ -35,7 +36,7 @@ AboutDialog::AboutDialog (wxWindow* parent) { wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); - + wxFont title_font (*wxNORMAL_FONT); title_font.SetPointSize (title_font.GetPointSize() + 12); title_font.SetWeight (wxFONTWEIGHT_BOLD); @@ -45,7 +46,7 @@ AboutDialog::AboutDialog (wxWindow* parent) wxFont version_font (*wxNORMAL_FONT); version_font.SetWeight (wxFONTWEIGHT_BOLD); - + wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DCP-o-matic")); t->SetFont (title_font); sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16)); @@ -66,7 +67,7 @@ AboutDialog::AboutDialog (wxWindow* parent) wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); t->SetFont (subtitle_font); - + sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8)); wxHyperlinkCtrl* h = new wxHyperlinkCtrl ( @@ -79,10 +80,10 @@ AboutDialog::AboutDialog (wxWindow* parent) t = new wxStaticText ( this, wxID_ANY, - _("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), + _("(C) 2012-2017 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); - + sizer->Add (t, wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 16)); _notebook = new wxNotebook (this, wxID_ANY); @@ -97,96 +98,234 @@ 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 ("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")); - translated_by.Add (wxT ("Theo Kooijmans")); - translated_by.Add (wxT ("Max Aeschlimann")); - translated_by.Add (wxT ("Carsten Kurz")); - translated_by.Add (wxT ("Grégoire Ausina")); - translated_by.Add (wxT ("Cherif Ben Brahim")); - add_section (_("Translated by"), translated_by); + 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 (若文)")); + translated_by.Add (wxT ("刘汉源")); + add_section (_("Translated by"), translated_by); - wxArrayString artwork_by; - artwork_by.Add (wxT ("David Vignoni")); - add_section (_("Artwork by"), artwork_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")); + with_help_from.Add (wxT ("Julian van Mil")); + add_section (_("With help from"), with_help_from); wxArrayString supported_by; - supported_by.Add (wxT ("Manual AC")); + supported_by.Add (wxT ("Manuel AC")); supported_by.Add (wxT ("Kambiz Afshar")); + supported_by.Add (wxT ("Louis Albini")); + supported_by.Add (wxT ("Esteban Arrangoiz")); supported_by.Add (wxT ("Alex Asp")); + supported_by.Add (wxT ("Georges Asmar")); supported_by.Add (wxT ("Eric Audurier")); + supported_by.Add (wxT ("Kenneth Beals")); + supported_by.Add (wxT ("Jean-Pierre Beauviala")); supported_by.Add (wxT ("Louis Belloisy")); + supported_by.Add (wxT ("Frans van den Berg")); supported_by.Add (wxT ("Mike Blakesley")); + supported_by.Add (wxT ("Silvio Bonomi")); + supported_by.Add (wxT ("Fabio Bozzoli")); + supported_by.Add (wxT ("Pierre-Alexis Bontemps")); supported_by.Add (wxT ("Jeff Boot")); + supported_by.Add (wxT ("Alexander Buchholz")); + supported_by.Add (wxT ("Paul Carey")); + supported_by.Add (wxT ("Nathan Carpenter")); supported_by.Add (wxT ("Kieran Carroll")); supported_by.Add (wxT ("Matt Carter")); supported_by.Add (wxT ("Frank Cianciolo")); + supported_by.Add (wxT ("Central Cinema")); supported_by.Add (wxT ("Cinema Clarici")); + supported_by.Add (wxT ("Dan Cohen")); supported_by.Add (wxT ("Adam Colt")); supported_by.Add (wxT ("Adam Cousins")); + supported_by.Add (wxT ("Miller Creative Limited")); 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 ("e22.digital")); supported_by.Add (wxT ("Unwana Essien")); supported_by.Add (wxT ("Maxime Estoppey")); - supported_by.Add (wxT ("Frechen-Film e.V.")); + supported_by.Add (wxT ("Peter Ericson")); + supported_by.Add (wxT ("Darius Family")); + 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 ("Brett Friedman")); + supported_by.Add (wxT ("Stephen Furley")); + supported_by.Add (wxT ("filmtechniek.nl")); + supported_by.Add (wxT ("Peter Gara")); + supported_by.Add (wxT ("Jose Delio Ares Garcia")); + supported_by.Add (wxT ("Gartenbaukino")); 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 ("刘汉源")); + supported_by.Add (wxT ("Jeff Hemingway")); supported_by.Add (wxT ("Antonio Ruiz Hernandez")); + supported_by.Add (wxT ("Joseph Huether")); + supported_by.Add (wxT ("Film.Ca Inc.")); + supported_by.Add (wxT ("Denis Ivashvkevych")); + supported_by.Add (wxT ("Karl Jacob")); + supported_by.Add (wxT ("Henrik Jäger")); + supported_by.Add (wxT ("Tomasz Jagi")); supported_by.Add (wxT ("Jonathan Jensen")); + supported_by.Add (wxT ("Mathew Johns")); + supported_by.Add (wxT ("Thierry Journet")); + supported_by.Add (wxT ("Mario Kalogjera")); + supported_by.Add (wxT ("Zbigniew Kamiński")); + supported_by.Add (wxT ("Karn Karamad")); + supported_by.Add (wxT ("Klaus Karger")); + supported_by.Add (wxT ("Ikram Karimov")); 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 ("Alabama Kino")); + supported_by.Add (wxT ("James Kirst")); supported_by.Add (wxT ("Adam Klotblixt")); supported_by.Add (wxT ("Filip Kovcin")); + supported_by.Add (wxT ("Timm Kröger")); supported_by.Add (wxT ("Cihan Kulaber")); supported_by.Add (wxT ("Carsten Kurz")); + supported_by.Add (wxT ("David Armati Lechner")); supported_by.Add (wxT ("Lilian Lefranc")); + supported_by.Add (wxT ("Robert Legato")); supported_by.Add (wxT ("Sean Leigh")); supported_by.Add (wxT ("Olivier Lemaire")); + supported_by.Add (wxT ("Eric Lesachet")); supported_by.Add (wxT ("Gavin Lewarne")); supported_by.Add (wxT ("Theo Lipfert")); + supported_by.Add (wxT ("Paweł Lipiński")); + supported_by.Add (wxT ("Marco Löber")); + supported_by.Add (wxT ("Juan Marin Lorenzo")); + supported_by.Add (wxT ("Cinéma Le Louxor")); + supported_by.Add (wxT ("Michael Luce")); + supported_by.Add (wxT ("Mandorla")); + supported_by.Add (wxT ("Andrea Maguolo")); + supported_by.Add (wxT ("Gerard Manshanden")); + supported_by.Add (wxT ("Daniel Martinez Lara")); + supported_by.Add (wxT ("Stefan Massopust")); + supported_by.Add (wxT ("Richard Malmberg")); + supported_by.Add (wxT ("Adrian Manolescu")); supported_by.Add (wxT ("Mattias Mattsson")); + supported_by.Add (wxT ("George Mazarakis")); + supported_by.Add (wxT ("Mike Mazur")); + supported_by.Add (wxT ("Gordon McLeod")); + supported_by.Add (wxT ("P. Meijer")); + supported_by.Add (wxT ("Brian Mendelssohn")); + supported_by.Add (wxT ("Olaf Merker")); supported_by.Add (wxT ("Kjarten Michaelsen")); supported_by.Add (wxT ("Aldo Midali")); supported_by.Add (wxT ("Sylvain Mielle")); + supported_by.Add (wxT ("Jill Mobley")); + supported_by.Add (wxT ("Michal Moc")); + supported_by.Add (wxT ("Bobby Moloney")); + supported_by.Add (wxT ("Howard Molton")); supported_by.Add (wxT ("Lindsay Morris")); - supported_by.Add (wxT ("Гуляев Михаил")); + supported_by.Add (wxT ("Moviemento Kino")); + supported_by.Add (wxT ("NT Next")); supported_by.Add (wxT ("David Nedrow")); + supported_by.Add (wxT ("Niclas Nornemark")); + 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 ("Anders Olsson")); + supported_by.Add (wxT ("Kevin Orman")); + supported_by.Add (wxT ("Olov Östlund")); + supported_by.Add (wxT ("Vasiliy Popov")); supported_by.Add (wxT ("Rui Pereira")); + supported_by.Add (wxT ("Armin Peterhans")); + supported_by.Add (wxT ("Andrea Pieri")); + supported_by.Add (wxT ("Denis Postle")); + supported_by.Add (wxT ("Aditya Pratama")); + supported_by.Add (wxT ("ProCinema GmbH")); + supported_by.Add (wxT ("Ceridwen Productions")); supported_by.Add (wxT ("Ivan Pullman")); + supported_by.Add (wxT ("Arts Quest")); + supported_by.Add (wxT ("Desiderio Garcia Ramirez")); + supported_by.Add (wxT ("Steve Reverand")); supported_by.Add (wxT ("Mark Rolfe")); + supported_by.Add (wxT ("Leigh Rosin")); supported_by.Add (wxT ("David Rozenthal")); - supported_by.Add (wxT ("Andrä Steiner")); - supported_by.Add (wxT ("Jussi Siponen")); supported_by.Add (wxT ("Lasse Salling")); - supported_by.Add (wxT ("Mike Stiebing")); + supported_by.Add (wxT ("Jussi Siponen")); + supported_by.Add (wxT ("Gregg Smith")); + supported_by.Add (wxT ("Marco Spiaggi")); + 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 ("Rapid Stream Media")); + 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 ("Texas Theatre")); supported_by.Add (wxT ("Lawrence Towers")); + supported_by.Add (wxT ("Petter Trønsdal")); supported_by.Add (wxT ("Richard Turner")); + supported_by.Add (wxT ("Tilman Vatteroth")); + supported_by.Add (wxT ("Alexey Vinokurov")); + supported_by.Add (wxT ("Anthony Urgo")); + 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")); - supported_by.Add (wxT ("Wolfram Weber")); - supported_by.Add (wxT ("Johannes Wilbrand")); supported_by.Add (wxT ("Frank de Wulf")); supported_by.Add (wxT ("Pavel Zhdanko")); supported_by.Add (wxT ("Daniel Židek")); + supported_by.Add (wxT ("Гуляев Михаил")); + supported_by.Add (wxT ("Arrow Media Services")); + 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 ("Kino Völkerfreundschaft")); + supported_by.Add (wxT ("Ernst Zimmerman")); add_section (_("Supported by"), supported_by); wxArrayString tested_by; + tested_by.Add (wxT ("Manuel AC")); tested_by.Add (wxT ("Trever Anderson")); tested_by.Add (wxT ("Mike Blakesley")); tested_by.Add (wxT ("David Booty")); @@ -195,6 +334,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")); @@ -204,6 +344,7 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Bill Hamell")); tested_by.Add (wxT ("Jonathan Jensen")); tested_by.Add (wxT ("Thierry Journet")); + tested_by.Add (wxT ("Markus Kalb")); tested_by.Add (wxT ("Ada de Kamper")); tested_by.Add (wxT ("Stefan Karner")); tested_by.Add (wxT ("Adam Keay")); @@ -215,25 +356,31 @@ AboutDialog::AboutDialog (wxWindow* parent) tested_by.Add (wxT ("Lilian Lefranc")); tested_by.Add (wxT ("Olivier Lemaire")); tested_by.Add (wxT ("Gavin Lewarne")); - tested_by.Add (wxT ("Mattias Mattsson")); 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")); tested_by.Add (wxT ("Markus Raab")); + tested_by.Add (wxT ("Michael Reckert")); 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 ("Xenophon the Vampire")); tested_by.Add (wxT ("Simon Vannarath")); + tested_by.Add (wxT ("Igor Voytovich")); tested_by.Add (wxT ("Andrew Walls")); tested_by.Add (wxT ("Andreas Weiss")); tested_by.Add (wxT ("Paul Willmott")); tested_by.Add (wxT ("Wolfgang Woehl")); add_section (_("Tested by"), tested_by); - + sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand()); overall_sizer->Add (sizer); @@ -242,7 +389,7 @@ AboutDialog::AboutDialog (wxWindow* parent) if (buttons) { overall_sizer->Add (buttons, 1, wxEXPAND | wxALL, 4); } - + SetSizerAndFit (overall_sizer); } @@ -254,13 +401,16 @@ 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; - + for (int i = 0; i < N; ++i) { sizers.push_back (new wxBoxSizer (wxVERTICAL)); overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6);