projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect results when applying some timing operations to
[dcpomatic.git]
/
src
/
wx
/
update_dialog.cc
diff --git
a/src/wx/update_dialog.cc
b/src/wx/update_dialog.cc
index e0c08ef158a1356ccf9f06e225fadfa0b02f6a71..e864564acd118c7822eda99cba6c99db7faca67f 100644
(file)
--- a/
src/wx/update_dialog.cc
+++ b/
src/wx/update_dialog.cc
@@
-1,25
+1,27
@@
/*
/*
- 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.
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
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 "update_dialog.h"
+#include "static_text.h"
#include "wx_util.h"
#include "wx_util.h"
+#include <wx/hyperlink.h>
using std::string;
using boost::optional;
using std::string;
using boost::optional;
@@
-32,9
+34,9
@@
UpdateDialog::UpdateDialog (wxWindow* parent, optional<string> stable, optional<
wxStaticText* message;
if ((stable || test) && !(stable && test)) {
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 {
} 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, 1, wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER);
@@
-43,13
+45,13
@@
UpdateDialog::UpdateDialog (wxWindow* parent, optional<string> stable, optional<
if (stable) {
add_label_to_sizer (table, this, _("Stable version ") + std_to_wx (stable.get ()), true);
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");
+ wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/download", "http
s
://dcpomatic.com/download");
table->Add (h);
}
if (test) {
add_label_to_sizer (table, this, _("Test version ") + std_to_wx (test.get ()), true);
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", "http://dcpomatic.com/test-download");
+ wxHyperlinkCtrl* h = new wxHyperlinkCtrl (this, wxID_ANY, "dcpomatic.com/test-download", "http
s
://dcpomatic.com/test-download");
table->Add (h);
}
table->Add (h);
}