X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=28ecf36c06c7d605ef082939df25f79ff6fc9251;hb=897f2a6602ec910f663ac0f8da0436f2e3394962;hp=9b14a74e4468d13ab35dda55ad9cb3d8ac1b67b7;hpb=f455579f4c2fd2321b2891a03cd9e466b2299148;p=dcpomatic.git diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index 9b14a74e4..28ecf36c0 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,12 +21,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 +35,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 +45,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)); @@ -62,11 +62,11 @@ AboutDialog::AboutDialog (wxWindow* parent) t = new wxStaticText ( this, wxID_ANY, - _("Free, open-source DCP generation from almost anything."), + _("Free, open-source DCP creation from almost anything."), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER ); t->SetFont (subtitle_font); - + sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8)); wxHyperlinkCtrl* h = new wxHyperlinkCtrl ( @@ -79,10 +79,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-2016 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); @@ -92,90 +92,142 @@ AboutDialog::AboutDialog (wxWindow* parent) written_by.Add (wxT ("Terrence Meiczinger")); 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 translated_by; translated_by.Add (wxT ("Manuel AC")); + translated_by.Add (wxT ("Max Aeschlimann")); + translated_by.Add (wxT ("Grégoire Ausina")); + translated_by.Add (wxT ("Tomáš Begeni")); + 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 ("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")); + 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 ("Rob van Nieuwkerk")); 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")); + 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 ("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 ("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 ("Karl Jacob")); supported_by.Add (wxT ("Jonathan Jensen")); + supported_by.Add (wxT ("Thierry Journet")); + 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 ("George Mazarakis")); 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 ("Гуляев Михаил")); 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 ("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 ("Mark Rolfe")); 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 ("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 ("Roland Wirtz")); - supported_by.Add (wxT ("Wolfgang Woehl")); + 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 ("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 ("Mobiles Kino e.V.")); supported_by.Add (wxT ("Daniel Židek")); + supported_by.Add (wxT ("Гуляев Михаил")); add_section (_("Supported by"), supported_by); wxArrayString tested_by; @@ -187,6 +239,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 ("Jose Angel Velasco Fernandez")); tested_by.Add (wxT ("Maurizio Giampà")); tested_by.Add (wxT ("Luke Granger-Brown")); tested_by.Add (wxT ("Sumit Guha")); @@ -195,6 +248,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")); @@ -206,24 +260,28 @@ 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 ("Mattias Mattsson")); tested_by.Add (wxT ("Will Meadows")); tested_by.Add (wxT ("Brad Miller")); + tested_by.Add (wxT ("Ash Mitchell")); 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 ("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); @@ -232,7 +290,7 @@ AboutDialog::AboutDialog (wxWindow* parent) if (buttons) { overall_sizer->Add (buttons, 1, wxEXPAND | wxALL, 4); } - + SetSizerAndFit (overall_sizer); } @@ -244,13 +302,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);