Add system information dialog with OpenGL version.

4 files changed, 70 insertions, 3 deletions

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index a5537b3a4..5c18d28cb 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -116,9 +116,6 @@ GLVideoView::paint (wxPaintEvent &)
 void
 GLVideoView::set_image (shared_ptr<const Image> image)
 {
-	/* XXX: put this somewhere sensible */
-	cout << glGetString (GL_VERSION) << "\n";
-
 	DCPOMATIC_ASSERT (image->pixel_format() == AV_PIX_FMT_RGB24);
 	DCPOMATIC_ASSERT (!image->aligned());
 
diff --git a/src/wx/system_information_dialog.cc b/src/wx/system_information_dialog.cc
new file mode 100644
index 000000000..3a2b3bbf6
--- /dev/null
+++ b/src/wx/system_information_dialog.cc
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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.
+
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "system_information_dialog.h"
+#include "wx_util.h"
+
+#ifdef DCPOMATIC_OSX
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#else
+#include <GL/glu.h>
+#include <GL/glext.h>
+#endif
+
+using std::string;
+
+SystemInformationDialog::SystemInformationDialog (wxWindow* parent)
+	: TableDialog (parent, _("System information"), 2, 1, false)
+{
+	add (_("OpenGL version"), true);
+	add (std_to_wx((char const *) glGetString(GL_VERSION)), false);
+
+	layout ();
+}
diff --git a/src/wx/system_information_dialog.h b/src/wx/system_information_dialog.h
new file mode 100644
index 000000000..b82c6341b
--- /dev/null
+++ b/src/wx/system_information_dialog.h
@@ -0,0 +1,28 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic 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.
+
+    DCP-o-matic 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 DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "table_dialog.h"
+
+class SystemInformationDialog : public TableDialog
+{
+public:
+	SystemInformationDialog (wxWindow* parent);
+
+};
diff --git a/src/wx/wscript b/src/wx/wscript
index 580e49308..9847187c6 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -120,6 +120,7 @@ sources = """
           static_text.cc
           subtitle_appearance_dialog.cc
           system_font_dialog.cc
+          system_information_dialog.cc
           table_dialog.cc
           templates_dialog.cc
           text_panel.cc