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 a7b1908f11e2d377b6fed4e1e0f472d9a120c1a1..95a4cc426014ae2e3dcafb420a5c3f11424ee09b 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -29,6 +29,7 @@ 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);
@@ -104,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"));
@@ -120,11 +122,20 @@ AboutDialog::AboutDialog (wxWindow* parent)
        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(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