3 columns in the about box looks better (especially on macOS).

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

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 0e8e07f621ec4943318db9ef6c311c56003db357..b643eb8235152d975b9f87dfbe94d28e18065fbf 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -18,23 +18,25 @@
 
 */
 
+
 /** @file  src/wx/about_dialog.cc
  *  @brief The "about DCP-o-matic" dialogue box.
  */
 
 #include "about_dialog.h"
-#include "wx_util.h"
 #include "static_text.h"
-#include "lib/version.h"
+#include "wx_util.h"
 #include "lib/compose.hpp"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "lib/version.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/hyperlink.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 using std::vector;
 
+
 AboutDialog::AboutDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("About DCP-o-matic"))
 {
@@ -84,7 +86,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        t = new StaticText (
                this,
-               _("(C) 2012-2022 Carl Hetherington, Terrence Meiczinger\n Ole Laursen"),
+               _("(C) 2012-2024 Carl Hetherington, Terrence Meiczinger\n Ole Laursen"),
                wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
                );
 
@@ -111,14 +113,17 @@ AboutDialog::AboutDialog (wxWindow* parent)
        wxArrayString translated_by;
        translated_by.Add (wxT ("Manuel AC"));
        translated_by.Add (wxT ("Max Aeschlimann"));
+       translated_by.Add (wxT ("Gökhan Aksoy"));
        translated_by.Add (wxT ("Thiago Andre"));
        translated_by.Add (wxT ("Felice D'Andrea"));
+       translated_by.Add (wxT ("Németh Áron"));
        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 ("Akivili Collindort"));
        translated_by.Add (wxT ("Davide Dall'AraCiao"));
        translated_by.Add (wxT ("Uwe Dittes"));
        translated_by.Add (wxT ("Михаил Эпштейн"));
@@ -135,22 +140,24 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Mike Mazur"));
        translated_by.Add (wxT ("Rob van Nieuwkerk"));
        translated_by.Add (wxT ("Anders Uhl Pedersen"));
+       translated_by.Add (wxT ("David Perrenoud"));
        translated_by.Add (wxT ("Olivier Perriere"));
        translated_by.Add (wxT ("Markus Raab"));
+       translated_by.Add (wxT ("Soleyman Rahmani"));
        translated_by.Add (wxT ("Tiago Casal Ribeiro"));
        translated_by.Add (wxT ("Davide Sanvito"));
        translated_by.Add (wxT ("Marek Skrzelowski"));
+       translated_by.Add (wxT ("Danbo Song"));
+       translated_by.Add (wxT ("Martin Srebotnjak"));
+       translated_by.Add (wxT ("Michał Tomaszewski"));
        translated_by.Add (wxT ("Igor Voytovich"));
        translated_by.Add (wxT ("Rov (若文)"));
        translated_by.Add (wxT ("刘汉源"));
-       translated_by.Add (wxT ("Gökhan Aksoy"));
-       add_section (_("Translated by"), translated_by);
+       translated_by.Add (wxT ("poppinzhang"));
+       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;
@@ -164,6 +171,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        wxArrayString tested_by;
        tested_by.Add (wxT ("Manuel AC"));
        tested_by.Add (wxT ("Trever Anderson"));
+       tested_by.Add (wxT ("Mohamad W. Ali"));
        tested_by.Add (wxT ("JP Beauviala"));
        tested_by.Add (wxT ("Mike Blakesley"));
        tested_by.Add (wxT ("David Booty"));
@@ -172,6 +180,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Daniel Chauvet"));
        tested_by.Add (wxT ("Adam Colt"));
        tested_by.Add (wxT ("John Convertino"));
+       tested_by.Add (wxT ("Daniel Courville"));
+       tested_by.Add (wxT ("Marek Dudzik"));
        tested_by.Add (wxT ("Andreas Eli"));
        tested_by.Add (wxT ("Leo Enticknap"));
        tested_by.Add (wxT ("Jose Angel Velasco Fernandez"));
@@ -221,6 +231,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
        tested_by.Add (wxT ("Andreas Weiss"));
        tested_by.Add (wxT ("Paul Willmott"));
        tested_by.Add (wxT ("Wolfgang Woehl"));
+       tested_by.Add (wxT ("Benno Zwanenburg"));
+       tested_by.Add (wxT ("Дима Агатов"));
        add_section (_("Tested by"), tested_by);
 
        sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16));
@@ -243,7 +255,7 @@ void
 AboutDialog::add_section (wxString name, wxArrayString credits)
 {
        static auto first = true;
-       int const N = 4;
+       int const N = 3;
 
        auto panel = new wxScrolledWindow (_notebook);
        panel->SetMaxSize (wxSize (-1, 380));