Update dialog layout fixes.

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

diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc
index e0c08ef158a1356ccf9f06e225fadfa0b02f6a71..0b4753d1b6e769ced154f65db86b93534317eb38 100644 (file)
--- a/src/wx/update_dialog.cc
+++ b/src/wx/update_dialog.cc
@@ -1,63 +1,71 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <wx/hyperlink.h>
+
 #include "update_dialog.h"
+#include "static_text.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/hyperlink.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 using std::string;
 using boost::optional;
 
+
 UpdateDialog::UpdateDialog (wxWindow* parent, optional<string> stable, optional<string> test)
        : wxDialog (parent, wxID_ANY, _("Update"))
 {
-       wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+       auto overall_sizer = new wxBoxSizer (wxVERTICAL);
 
        wxStaticText* message;
 
        if ((stable || test) && !(stable && test)) {
-               message = new wxStaticText (this, wxID_ANY, _("A new version of DCP-o-matic is available."));
+               message = new StaticText (this, _("A new version of DCP-o-matic is available."));
        } else {
-               message = new wxStaticText (this, wxID_ANY, _("New versions of DCP-o-matic are available."));
+               message = new StaticText (this, _("New versions of DCP-o-matic are available."));
        }
 
-       overall_sizer->Add (message, 1, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
+       overall_sizer->Add (message, 0, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
        if (stable) {
-               add_label_to_sizer (table, this, _("Stable version ") + std_to_wx (stable.get ()), true);
-               wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/download", "http://dcpomatic.com/download");
-               table->Add (h);
+               add_label_to_sizer (table, this, _("Stable version ") + std_to_wx(stable.get()), true, 0, wxALIGN_CENTER_VERTICAL);
+               auto h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/download", "https://dcpomatic.com/download");
+               table->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_DIALOG_BORDER);
        }
 
        if (test) {
-               add_label_to_sizer (table, this, _("Test version ") + std_to_wx (test.get ()), true);
-               wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/test-download", "http://dcpomatic.com/test-download");
-               table->Add (h);
+               add_label_to_sizer (table, this, _("Test version ") + std_to_wx(test.get()), true, 0, wxALIGN_CENTER_VERTICAL);
+               auto h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/test-download", "https://dcpomatic.com/test-download");
+               table->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_DIALOG_BORDER);
        }
 
-       overall_sizer->Add (table, 1, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_DIALOG_BORDER);
+       overall_sizer->Add (table, 0, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
 
-       wxSizer* buttons = CreateButtonSizer (wxOK);
+       auto buttons = CreateButtonSizer (wxOK);
        if (buttons) {
-               overall_sizer->Add (buttons, 1, wxEXPAND | wxALL);
+               overall_sizer->Add (buttons, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
        }
 
        SetSizerAndFit (overall_sizer);