Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

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

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 0c56cf1be0ea56c865922f93c590e006f6c4346d..95a4cc426014ae2e3dcafb420a5c3f11424ee09b 100644 (file)
--- 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,7 +71,7 @@ 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,
@@ -74,7 +79,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
                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);
 
@@ -100,6 +105,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Manual AC"));
        supported_by.Add (wxT ("Theo Lipfert"));
        supported_by.Add (wxT ("Olivier Lemaire"));
+       supported_by.Add (wxT ("Mattias Mattsson"));
        supported_by.Add (wxT ("Andrä Steiner"));
        supported_by.Add (wxT ("Jonathan Jensen"));
        supported_by.Add (wxT ("Kjarten Michaelsen"));
@@ -113,11 +119,23 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Lasse Salling"));
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Kieran Carroll"));
+       supported_by.Add (wxT ("Kambiz Afshar"));
+       supported_by.Add (wxT ("Sean Leigh"));
+       supported_by.Add (wxT ("Wolfram Weber"));
+       supported_by.Add (wxT ("Randy Stankey"));
+       supported_by.Add (wxT ("Frank Cianciolo"));
        add_section (_("Supported by"), supported_by);
 
-       sizer->Add (_notebook, wxSizerFlags().Centre().Border().Expand());
+       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
@@ -138,7 +156,7 @@ AboutDialog::add_section (wxString name, wxArrayString credits)
 
        int c = 0;
        for (size_t i = 0; i < credits.Count(); ++i) {
-               add_label_to_sizer (sizers[c], panel, credits[i]);
+               add_label_to_sizer (sizers[c], panel, credits[i], false);
                ++c;
                if (c == N) {
                        c = 0;