Merge master.

4 files changed, 186 insertions, 2 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
new file mode 100644
index 000000000..7844180fa
--- /dev/null
+++ b/src/wx/about_dialog.cc
@@ -0,0 +1,151 @@
+/*
+    Copyright (C) 2013 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/notebook.h>
+#include <wx/hyperlink.h>
+#include "lib/version.h"
+#include "lib/compose.hpp"
+#include "about_dialog.h"
+#include "wx_util.h"
+
+using std::vector;
+
+AboutDialog::AboutDialog (wxWindow* parent)
+	: wxDialog (parent, wxID_ANY, _("About DCP-o-matic"))
+{
+	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	
+	wxFont title_font (*wxNORMAL_FONT);
+	title_font.SetPointSize (title_font.GetPointSize() + 4);
+	title_font.SetWeight (wxFONTWEIGHT_BOLD);
+
+	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());
+
+	wxString s;
+	if (strcmp (dcpomatic_git_commit, "release") == 0) {
+		t = new wxStaticText (this, wxID_ANY, 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->SetFont (version_font);
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+	sizer->AddSpacer (12);
+
+	t = new wxStaticText (
+		this, wxID_ANY,
+		_("Free, open-source DCP generation from almost anything."),
+		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
+		);
+	
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+
+	wxHyperlinkCtrl* h = new wxHyperlinkCtrl (
+		this, wxID_ANY,
+		wxT ("www.carlh.net/software/dcpomatic"),
+		wxT ("http://www.carlh.net/software/dcpomatic")
+		);
+
+	sizer->Add (h, wxSizerFlags().Centre().Border());
+
+	t = new wxStaticText (
+		this, wxID_ANY,
+		_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"),
+		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
+		);
+	
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+
+	_notebook = new wxNotebook (this, wxID_ANY);
+
+	wxArrayString written_by;
+	written_by.Add (wxT ("Carl Hetherington"));
+	written_by.Add (wxT ("Terrence Meiczinger"));
+	written_by.Add (wxT ("Paul Davis"));
+	written_by.Add (wxT ("Ole Laursen"));
+	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 ("Adam Klotblixt"));
+	add_section (_("Translated by"), translated_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 ("Cinema Clarici"));
+	supported_by.Add (wxT ("Evan Freeze"));
+	supported_by.Add (wxT ("Flor Guillaume"));
+	supported_by.Add (wxT ("Adam Klotblixt "));
+	supported_by.Add (wxT ("Lilian Lefranc"));
+	supported_by.Add (wxT ("Gavin Lewarne"));
+	supported_by.Add (wxT ("Lasse Salling"));
+	supported_by.Add (wxT ("Andres Fink"));
+	supported_by.Add (wxT ("Kieran Carroll"));
+	add_section (_("Supported by"), supported_by);
+
+	sizer->Add (_notebook, wxSizerFlags().Centre().Border().Expand());
+	
+	SetSizerAndFit (sizer);
+}
+
+void
+AboutDialog::add_section (wxString name, wxArrayString credits)
+{
+	static bool first = true;
+	int const N = 3;
+
+	wxPanel* panel = new wxPanel (_notebook, wxID_ANY);
+	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);
+	}
+
+	int c = 0;
+	for (size_t i = 0; i < credits.Count(); ++i) {
+		add_label_to_sizer (sizers[c], panel, credits[i]);
+		++c;
+		if (c == N) {
+			c = 0;
+		}
+	}
+
+	panel->SetSizerAndFit (overall_sizer);
+	_notebook->AddPage (panel, name, first);
+	first = false;
+}
diff --git a/src/wx/about_dialog.h b/src/wx/about_dialog.h
new file mode 100644
index 000000000..a78abb93e
--- /dev/null
+++ b/src/wx/about_dialog.h
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2013 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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <wx/wx.h>
+
+class wxNotebook;
+
+class AboutDialog : public wxDialog
+{
+public:
+	AboutDialog (wxWindow *);
+
+private:
+	void add_section (wxString, wxArrayString);
+
+	wxNotebook* _notebook;
+};
+
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 3ff32280d..34646c2b7 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -21,8 +21,6 @@ msgstr ""
 msgid "%"
 msgstr "%"
 
-msgid "(restart DCP-o-matic to see language changes)"
-
 #: src/wx/film_editor.cc:1276
 msgid "1 channel"
 msgstr "1 canal"
diff --git a/src/wx/wscript b/src/wx/wscript
index d915f5899..992f31175 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -4,6 +4,7 @@ from waflib import Logs
 import i18n
 
 sources = """
+          about_dialog.cc
           audio_dialog.cc
           audio_mapping_view.cc
           audio_plot.cc