You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.6 KiB
46 lines
1.6 KiB
--- 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)))
|
|
{
|