No-op: remove all trailing whitespace.

[dcpomatic.git] / src / wx / about_dialog.cc

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 2e2b26cb9e4913b00d2e8221bcc36a840c96729c..142705a557008d90f12dee019242592d7223b02a 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     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
@@ -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-2014 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+               _("(C) 2012-2015 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,6 +92,7 @@ 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;
@@ -110,14 +111,17 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Cherif Ben Brahim"));
        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 ("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 ("Jeff Boot"));
@@ -126,14 +130,19 @@ AboutDialog::AboutDialog (wxWindow* parent)
        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 ("Cinéma de la Neuveville"));
        supported_by.Add (wxT ("Unwana Essien"));
        supported_by.Add (wxT ("Maxime Estoppey"));
+       supported_by.Add (wxT ("Frechen-Film e.V."));
+       supported_by.Add (wxT ("Jose Angel Velasco Fernandez"));
        supported_by.Add (wxT ("Andres Fink"));
        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 ("Flor Guillaume"));
        supported_by.Add (wxT ("Patrick Haderer"));
        supported_by.Add (wxT ("Antonio Ruiz Hernandez"));
@@ -156,6 +165,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Гуляев Михаил"));
        supported_by.Add (wxT ("David Nedrow"));
        supported_by.Add (wxT ("Tim O'Brien"));
+       supported_by.Add (wxT ("Jerome Cohen Olivar"));
+       supported_by.Add (wxT ("Rui Pereira"));
        supported_by.Add (wxT ("Ivan Pullman"));
        supported_by.Add (wxT ("Mark Rolfe"));
        supported_by.Add (wxT ("David Rozenthal"));
@@ -165,8 +176,14 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Mike Stiebing"));
        supported_by.Add (wxT ("Randy Stankey"));
        supported_by.Add (wxT ("Bruce Taylor"));
+       supported_by.Add (wxT ("Lawrence Towers"));
+       supported_by.Add (wxT ("Richard Turner"));
+       supported_by.Add (wxT ("Raoul Walzer"));
+       supported_by.Add (wxT ("Frank Wenz"));
+       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"));
@@ -181,6 +198,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"));
@@ -204,6 +222,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Gérald Maruccia"));
        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"));
@@ -217,7 +236,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        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);
@@ -226,7 +245,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        if (buttons) {
                overall_sizer->Add (buttons, 1, wxEXPAND | wxALL, 4);
        }
-       
+
        SetSizerAndFit (overall_sizer);
 }
 
@@ -244,7 +263,7 @@ AboutDialog::add_section (wxString name, wxArrayString credits)
        wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL);
 
        vector<wxSizer*> sizers;
-       
+
        for (int i = 0; i < N; ++i) {
                sizers.push_back (new wxBoxSizer (wxVERTICAL));
                overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6);