/*
- Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "about_dialog.h"
#include "wx_util.h"
+#include "static_text.h"
#include "lib/version.h"
#include "lib/compose.hpp"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/notebook.h>
#include <wx/hyperlink.h>
+DCPOMATIC_ENABLE_WARNINGS
using std::vector;
AboutDialog::AboutDialog (wxWindow* parent)
: wxDialog (parent, wxID_ANY, _("About DCP-o-matic"))
{
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
- wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+ auto overall_sizer = new wxBoxSizer (wxVERTICAL);
+ auto sizer = new wxBoxSizer (wxVERTICAL);
wxFont title_font (*wxNORMAL_FONT);
title_font.SetPointSize (title_font.GetPointSize() + 12);
wxFont version_font (*wxNORMAL_FONT);
version_font.SetWeight (wxFONTWEIGHT_BOLD);
- wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DCP-o-matic"));
+ auto t = new StaticText (this, _("DCP-o-matic"));
t->SetFont (title_font);
sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16));
wxString s;
if (strcmp (dcpomatic_git_commit, "release") == 0) {
- t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1", dcpomatic_version)));
+ t = new StaticText (this, std_to_wx(String::compose("Version %1", dcpomatic_version)));
} else {
- t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
+ t = new StaticText (this, std_to_wx(String::compose("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
}
t->SetFont (version_font);
sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2));
sizer->AddSpacer (12);
- t = new wxStaticText (
- this, wxID_ANY,
+ t = new StaticText (
+ this,
_("Free, open-source DCP creation from almost anything."),
wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
);
sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8));
- wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
+ auto h = new wxHyperlinkCtrl (
this, wxID_ANY,
wxT ("dcpomatic.com"),
- wxT ("http://dcpomatic.com")
+ wxT ("https://dcpomatic.com")
);
sizer->Add (h, wxSizerFlags().Centre().Border(wxALL, 8));
- t = new wxStaticText (
- this, wxID_ANY,
- _("(C) 2012-2018 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+ t = new StaticText (
+ this,
+ _("(C) 2012-2021 Carl Hetherington, Terrence Meiczinger\n Ole Laursen"),
wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
);
written_by.Add (wxT ("Terrence Meiczinger"));
written_by.Add (wxT ("Mart Jansink"));
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 with_help_from;
+ with_help_from.Add (wxT ("David Vignoni"));
+ with_help_from.Add (wxT ("Dennis Couzin"));
+ with_help_from.Add (wxT ("Carsten Kurz"));
+ with_help_from.Add (wxT ("Gérald Maruccia"));
+ with_help_from.Add (wxT ("Julian van Mil"));
+ with_help_from.Add (wxT ("Lilian Lefranc"));
+ add_section (_("With help from"), with_help_from);
+
wxArrayString translated_by;
translated_by.Add (wxT ("Manuel AC"));
translated_by.Add (wxT ("Max Aeschlimann"));
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 ("Davide Dall'AraCiao"));
translated_by.Add (wxT ("William Fanelli"));
translated_by.Add (wxT ("Max M. Fuhlendorf"));
translated_by.Add (wxT ("Carsten Kurz"));
translated_by.Add (wxT ("Lilian Lefranc"));
translated_by.Add (wxT ("Gérald Maruccia"));
+ translated_by.Add (wxT ("Mattias Mattsson"));
translated_by.Add (wxT ("Mike Mazur"));
translated_by.Add (wxT ("Rob van Nieuwkerk"));
translated_by.Add (wxT ("Anders Uhl Pedersen"));
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);
- 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 patrons;
+ patrons.Add ("Luproduction");
+ patrons.Add ("Lightbender Post");
+ patrons.Add ("Drop-out Cinema");
+ patrons.Add ("Pilotkino LLC");
+ add_section (_("Patrons"), patrons);
wxArrayString subscribers;
#include "subscribers.cc"
tested_by.Add (wxT ("JP Beauviala"));
tested_by.Add (wxT ("Mike Blakesley"));
tested_by.Add (wxT ("David Booty"));
+ tested_by.Add (wxT ("Antonio Casado"));
tested_by.Add (wxT ("Roop Chand"));
tested_by.Add (wxT ("Daniel Chauvet"));
tested_by.Add (wxT ("Adam Colt"));
tested_by.Add (wxT ("Steve Guttag"));
tested_by.Add (wxT ("Patrick Haderer"));
tested_by.Add (wxT ("Bill Hamell"));
+ tested_by.Add (wxT ("Groet Han"));
tested_by.Add (wxT ("Jonathan Jensen"));
tested_by.Add (wxT ("Thierry Journet"));
tested_by.Add (wxT ("Markus Kalb"));
tested_by.Add (wxT ("Carsten Kurz"));
tested_by.Add (wxT ("Bill Lam"));
tested_by.Add (wxT ("Lilian Lefranc"));
+ tested_by.Add (wxT ("Sebastian Leitner"));
tested_by.Add (wxT ("Olivier Lemaire"));
tested_by.Add (wxT ("Gavin Lewarne"));
tested_by.Add (wxT ("Gérald Maruccia"));
tested_by.Add (wxT ("Wolfgang Woehl"));
add_section (_("Tested by"), tested_by);
- sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16).Expand());
+ sizer->Add (_notebook, wxSizerFlags().Centre().Border(wxALL, 16));
overall_sizer->Add (sizer);
void
AboutDialog::add_section (wxString name, wxArrayString credits)
{
- static bool first = true;
+ static auto first = true;
int const N = 4;
- wxScrolledWindow* panel = new wxScrolledWindow (_notebook);
+ auto panel = new wxScrolledWindow (_notebook);
panel->SetMaxSize (wxSize (-1, 380));
panel->EnableScrolling (false, true);
panel->SetScrollRate (0, 32);
- wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL);
+ auto overall_sizer = new wxBoxSizer (wxHORIZONTAL);
vector<wxSizer*> sizers;
projects / dcpomatic.git / blobdiff