1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- a/gui/preferences.ui 2017-01-21 00:38:44.929972188 +0100
+++ b/gui/preferences.ui 2017-01-21 00:50:05.314477610 +0100
@@ -46,13 +46,6 @@
</property>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
- <property name="text">
- <string>Ignore mismatch between command line and GUI version.</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</widget>
--- a/gui/preferences.cc 2017-01-21 00:39:20.648418701 +0100
+++ b/gui/preferences.cc 2017-01-21 00:50:33.451829352 +0100
@@ -40,7 +40,6 @@
ui_.setupUi(this);
ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_);
- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_);
// Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
if (VERSION == QString("1.4.1"))
babelData_.ignoreVersionMismatch_ = false;
@@ -82,7 +81,6 @@
}
babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
accept();
}
--- a/gui/babeldata.h 2017-01-21 00:40:03.888959247 +0100
+++ b/gui/babeldata.h 2017-01-21 00:51:05.753233149 +0100
@@ -66,7 +66,7 @@
startupVersionCheck_(false),
reportStatistics_(false),
allowBetaUpgrades_(false),
- ignoreVersionMismatch_(false),
+ ignoreVersionMismatch_(true),
disableDonateDialog_(false),
donateSplashed_(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
{
|
GitWeb
