X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fabout_dialog.cc;h=8dea6174796272083e92615694d6d9b681414c81;hb=e55d6da8817488f7a639130be54bcab152d19b89;hp=ca19326a1de2abacd87ef7311332d4258cc1c4fe;hpb=89115db77729a2c99f1a09ff6a461720e16f889e;p=dcpomatic.git

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index ca19326a1..8dea61747 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -29,18 +29,22 @@ 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);
 	
 	wxFont title_font (*wxNORMAL_FONT);
-	title_font.SetPointSize (title_font.GetPointSize() + 4);
+	title_font.SetPointSize (title_font.GetPointSize() + 12);
 	title_font.SetWeight (wxFONTWEIGHT_BOLD);
 
+	wxFont subtitle_font (*wxNORMAL_FONT);
+	subtitle_font.SetPointSize (subtitle_font.GetPointSize() + 2);
+
 	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());
+	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 16));
 
 	wxString s;
 	if (strcmp (dcpomatic_git_commit, "release") == 0) {
@@ -49,7 +53,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 		t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1 git %2", dcpomatic_version, dcpomatic_git_commit)));
 	}
 	t->SetFont (version_font);
-	sizer->Add (t, wxSizerFlags().Centre().Border());
+	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 2));
 	sizer->AddSpacer (12);
 
 	t = new wxStaticText (
@@ -57,8 +61,9 @@ AboutDialog::AboutDialog (wxWindow* parent)
 		_("Free, open-source DCP generation from almost anything."),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
+	t->SetFont (subtitle_font);
 	
-	sizer->Add (t, wxSizerFlags().Centre().Border());
+	sizer->Add (t, wxSizerFlags().Centre().Border(wxALL, 8));
 
 	wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
 		this, wxID_ANY,
@@ -66,15 +71,15 @@ AboutDialog::AboutDialog (wxWindow* parent)
 		wxT ("http://dcpomatic.com")
 		);
 
-	sizer->Add (h, wxSizerFlags().Centre().Border());
+	sizer->Add (h, wxSizerFlags().Centre().Border(wxALL, 8));
 
 	t = new wxStaticText (
 		this, wxID_ANY,
-		_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"),
+		_("(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
 	
-	sizer->Add (t, wxSizerFlags().Centre().Border());
+	sizer->Add (t, wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 16));
 
 	_notebook = new wxNotebook (this, wxID_ANY);
 
@@ -86,38 +91,113 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	add_section (_("Written by"), written_by);
 
 	wxArrayString translated_by;
-	translated_by.Add (wxT ("Olivier Perriere"));
-	translated_by.Add (wxT ("Lilian Lefranc"));
-	translated_by.Add (wxT ("Thierry Journet"));
-	translated_by.Add (wxT ("Massimiliano Broggi"));
 	translated_by.Add (wxT ("Manuel AC"));
+	translated_by.Add (wxT ("Massimiliano Broggi"));
+	translated_by.Add (wxT ("William Fanelli"));
+	translated_by.Add (wxT ("Thierry Journet"));
 	translated_by.Add (wxT ("Adam Klotblixt"));
+	translated_by.Add (wxT ("Lilian Lefranc"));
+	translated_by.Add (wxT ("Olivier Perriere"));
+	translated_by.Add (wxT ("Markus Raab"));
+	translated_by.Add (wxT ("Theo Kooijmans"));
 	add_section (_("Translated by"), translated_by);
 
+	wxArrayString artwork_by;
+	artwork_by.Add (wxT ("David Vignoni"));
+	add_section (_("Artwork by"), artwork_by);
+
 	wxArrayString supported_by;
-	supported_by.Add (wxT ("Carsten Kurz"));
-	supported_by.Add (wxT ("Wolfgang Woehl"));
 	supported_by.Add (wxT ("Manual AC"));
-	supported_by.Add (wxT ("Theo Lipfert"));
-	supported_by.Add (wxT ("Olivier Lemaire"));
-	supported_by.Add (wxT ("Andrä Steiner"));
-	supported_by.Add (wxT ("Jonathan Jensen"));
-	supported_by.Add (wxT ("Kjarten Michaelsen"));
-	supported_by.Add (wxT ("Jussi Siponen"));
+	supported_by.Add (wxT ("Kambiz Afshar"));
+	supported_by.Add (wxT ("Jeff Boot"));
+	supported_by.Add (wxT ("Kieran Carroll"));
+	supported_by.Add (wxT ("Frank Cianciolo"));
 	supported_by.Add (wxT ("Cinema Clarici"));
+	supported_by.Add (wxT ("Adam Colt"));
+	supported_by.Add (wxT ("Andres Fink"));
 	supported_by.Add (wxT ("Evan Freeze"));
+	supported_by.Add (wxT ("Silvio Giuliano"));
 	supported_by.Add (wxT ("Flor Guillaume"));
-	supported_by.Add (wxT ("Adam Klotblixt "));
+	supported_by.Add (wxT ("Jonathan Jensen"));
+	supported_by.Add (wxT ("Chris Kay"));
+	supported_by.Add (wxT ("Adam Klotblixt"));
+	supported_by.Add (wxT ("Filip Kovcin"));
+	supported_by.Add (wxT ("Carsten Kurz"));
 	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 ("Mattias Mattsson"));
+	supported_by.Add (wxT ("Kjarten Michaelsen"));
+	supported_by.Add (wxT ("Aldo Midali"));
+	supported_by.Add (wxT ("Sylvain Mielle"));
+	supported_by.Add (wxT ("Lindsay Morris"));
+	supported_by.Add (wxT ("Tim O'Brien"));
+	supported_by.Add (wxT ("Ivan Pullman"));
+	supported_by.Add (wxT ("Andrä Steiner"));
+	supported_by.Add (wxT ("Jussi Siponen"));
 	supported_by.Add (wxT ("Lasse Salling"));
-	supported_by.Add (wxT ("Andres Fink"));
-	supported_by.Add (wxT ("Kieran Carroll"));
+	supported_by.Add (wxT ("Mike Stiebing"));
+	supported_by.Add (wxT ("Randy Stankey"));
+	supported_by.Add (wxT ("Wolfgang Woehl"));
+	supported_by.Add (wxT ("Wolfram Weber"));
+	supported_by.Add (wxT ("Frank de Wulf"));
+	supported_by.Add (wxT ("Pavel Zhdanko"));
 	add_section (_("Supported by"), supported_by);
 
-	sizer->Add (_notebook, wxSizerFlags().Centre().Border().Expand());
+	wxArrayString tested_by;
+	tested_by.Add (wxT ("Trever Anderson"));
+	tested_by.Add (wxT ("Mike Blakesley"));
+	tested_by.Add (wxT ("David Booty"));
+	tested_by.Add (wxT ("Roop Chand"));
+	tested_by.Add (wxT ("Adam Colt"));
+	tested_by.Add (wxT ("John Convertino"));
+	tested_by.Add (wxT ("Andreas Eli"));
+	tested_by.Add (wxT ("Maurizio Giampà"));
+	tested_by.Add (wxT ("Luke Granger-Brown"));
+	tested_by.Add (wxT ("Steve Guttag"));
+	tested_by.Add (wxT ("Patrick Haderer"));
+	tested_by.Add (wxT ("Jonathan Jensen"));
+	tested_by.Add (wxT ("Thierry Journet"));
+	tested_by.Add (wxT ("Ada de Kamper"));
+	tested_by.Add (wxT ("Stefan Karner"));
+	tested_by.Add (wxT ("Adam Keay"));
+	tested_by.Add (wxT ("Simon Kesselman"));
+	tested_by.Add (wxT ("Pepijn Klijs"));
+	tested_by.Add (wxT ("Denzil Kriekenbeek"));
+	tested_by.Add (wxT ("Carsten Kurz"));
+	tested_by.Add (wxT ("Bill Lam"));
+	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 ("Will Meadows"));
+	tested_by.Add (wxT ("Brad Miller"));
+	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 ("Greg Rooke"));
+	tested_by.Add (wxT ("Karim Senoucci"));
+	tested_by.Add (wxT ("Simon Vannarath"));
+	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);
+
+	wxSizer* buttons = CreateButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, 1, wxEXPAND | wxALL, 4);
+	}
 	
-	SetSizerAndFit (sizer);
+	SetSizerAndFit (overall_sizer);
 }
 
 void