diff options
| -rw-r--r-- | src/wx/update_dialog.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc index 4552628d6..9255592cc 100644 --- a/src/wx/update_dialog.cc +++ b/src/wx/update_dialog.cc @@ -23,6 +23,7 @@ #include "update_dialog.h" #include "wx_util.h" #include "wx_variant.h" +#include "lib/version.h" #include <dcp/warnings.h> LIBDCP_DISABLE_WARNINGS #include <wx/hyperlink.h> @@ -48,20 +49,25 @@ UpdateDialog::UpdateDialog (wxWindow* parent, optional<string> stable, optional< overall_sizer->Add (message, 0, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); - auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto table = new wxFlexGridSizer(3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); if (stable) { - add_label_to_sizer(table, this, wxString::Format(_("Stable version %s"), std_to_wx(stable.get())), true, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer(table, this, _("Stable version"), true, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer(table, this, std_to_wx(stable.get()), true, 0, wxALIGN_CENTER_VERTICAL); auto h = new wxHyperlinkCtrl (this, wxID_ANY, char_to_wx("dcpomatic.com/download"), char_to_wx("https://dcpomatic.com/download")); table->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_DIALOG_BORDER); } if (test) { - add_label_to_sizer(table, this, wxString::Format(_("Test version %s"), std_to_wx(test.get())), true, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer(table, this, _("Test version"), true, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer(table, this, std_to_wx(test.get()), true, 0, wxALIGN_CENTER_VERTICAL); auto h = new wxHyperlinkCtrl (this, wxID_ANY, char_to_wx("dcpomatic.com/test-download"), char_to_wx("https://dcpomatic.com/test-download")); table->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_DIALOG_BORDER); } + add_label_to_sizer(table, this, _("Current version"), true, 0, wxALIGN_CENTER_VERTICAL); + add_label_to_sizer(table, this, char_to_wx(dcpomatic_version), true, 0, wxALIGN_CENTER_VERTICAL); + overall_sizer->Add (table, 0, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); auto buttons = CreateButtonSizer (wxOK); |