*/
-#include "update_dialog.h"
+
#include "static_text.h"
+#include "update_dialog.h"
#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/hyperlink.h>
+LIBDCP_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;
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);