X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fupdate_dialog.cc;h=e864564acd118c7822eda99cba6c99db7faca67f;hp=271c4174c611a441197c889a0dd9a081b490fba1;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=e8204f55c981493b99814f71a50b3c3d62601032

diff --git a/src/wx/update_dialog.cc b/src/wx/update_dialog.cc
index 271c4174c..e864564ac 100644
--- a/src/wx/update_dialog.cc
+++ b/src/wx/update_dialog.cc
@@ -1,61 +1,66 @@
 /*
-    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 <wx/hyperlink.h>
 
 using std::string;
+using boost::optional;
 
-UpdateDialog::UpdateDialog (wxWindow* parent, string stable, string test)
+UpdateDialog::UpdateDialog (wxWindow* parent, optional<string> stable, optional<string> test)
 	: wxDialog (parent, wxID_ANY, _("Update"))
 {
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 
 	wxStaticText* message;
 
-	if (test.empty ()) {
-		message = new wxStaticText (this, wxID_ANY, _("A new version of DCP-o-matic is available."));
+	if ((stable || test) && !(stable && test)) {
+		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);
 
 	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-	add_label_to_sizer (table, this, _("Stable version ") + std_to_wx (stable), true);
-	wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/download", "http://dcpomatic.com/download");
-	table->Add (h);
-	
-	if (!test.empty ()) {
-		add_label_to_sizer (table, this, _("Test version ") + std_to_wx (test), true);
-		wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/test-download", "http://dcpomatic.com/test-download");
+	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", "https://dcpomatic.com/download");
+		table->Add (h);
+	}
+
+	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", "https://dcpomatic.com/test-download");
 		table->Add (h);
 	}
-	
-	overall_sizer->Add (table, 1, wxEXPAND | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
+
+	overall_sizer->Add (table, 1, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_DIALOG_BORDER);
 
 	wxSizer* buttons = CreateButtonSizer (wxOK);
 	if (buttons) {
 		overall_sizer->Add (buttons, 1, wxEXPAND | wxALL);
 	}
-	
+
 	SetSizerAndFit (overall_sizer);
 }