Merge master.

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

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 49294b865f951805276570a2c37cb282cd952953..7844180fa25b6ecb63ac003b848fd756f34cbeda 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -18,6 +18,7 @@
 */
 
 #include <wx/notebook.h>
+#include <wx/hyperlink.h>
 #include "lib/version.h"
 #include "lib/compose.hpp"
 #include "about_dialog.h"
@@ -26,7 +27,7 @@
 using std::vector;
 
 AboutDialog::AboutDialog (wxWindow* parent)
-       : wxDialog (parent, wxID_ANY, _("About DVD-o-matic"))
+       : wxDialog (parent, wxID_ANY, _("About DCP-o-matic"))
 {
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
        
@@ -37,15 +38,15 @@ AboutDialog::AboutDialog (wxWindow* parent)
        wxFont version_font (*wxNORMAL_FONT);
        version_font.SetWeight (wxFONTWEIGHT_BOLD);
        
-       wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DVD-o-matic"));
+       wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DCP-o-matic"));
        t->SetFont (title_font);
        sizer->Add (t, wxSizerFlags().Centre().Border());
 
        wxString s;
-       if (strcmp (dvdomatic_git_commit, "release") == 0) {
-               t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1", dvdomatic_version)));
+       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", dvdomatic_version, dvdomatic_git_commit)));
+               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());
@@ -59,6 +60,14 @@ AboutDialog::AboutDialog (wxWindow* parent)
        
        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"),
@@ -108,10 +117,6 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
        sizer->Add (_notebook, wxSizerFlags().Centre().Border().Expand());
        
-#if 0  
-       info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
-#endif
-
        SetSizerAndFit (sizer);
 }
 
@@ -128,7 +133,7 @@ AboutDialog::add_section (wxString name, wxArrayString credits)
        
        for (int i = 0; i < N; ++i) {
                sizers.push_back (new wxBoxSizer (wxVERTICAL));
-               overall_sizer->Add (sizers.back (), 1, wxEXPAND);
+               overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6);
        }
 
        int c = 0;