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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
From e24573dc7fce7c48da6b960a722b567f24e1318e Mon Sep 17 00:00:00 2001
From: "Andreas K. Huettel" <dilfridge@gentoo.org>
Date: Thu, 12 Mar 2020 19:48:16 +0100
Subject: [PATCH] Gentoo: Disable update check
---
gui/babeldata.h | 2 +-
gui/mainwindow.cc | 16 ----------------
gui/mainwinui.ui | 6 ------
gui/preferences.cc | 2 --
gui/preferences.ui | 7 -------
5 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/gui/babeldata.h b/gui/babeldata.h
index a8586f30..4d73a4e4 100644
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -64,7 +64,7 @@ public:
upgradeErrors_(0),
upgradeOffers_(0),
runCount_(0),
- startupVersionCheck_(true),
+ startupVersionCheck_(false),
reportStatistics_(false),
allowBetaUpgrades_(false),
ignoreVersionMismatch_(false),
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index adbac733..b0a8483a 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -174,7 +174,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
connect(ui_.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
connect(ui_.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
connect(ui_.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
- connect(ui_.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
connect(ui_.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
connect(ui_.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
@@ -233,17 +232,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent)
restoreSettings();
upgrade = new UpgradeCheck(parent, formatList_, babelData_);
- if (babelData_.startupVersionCheck_) {
- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_,
- allowBetaUpgrades());
- }
-
- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) {
- VersionMismatch vm(nullptr, babelVersion_, QString(VERSION));
-
- vm.exec();
- babelData_.ignoreVersionMismatch_ = vm.neverAgain();
- }
}
//------------------------------------------------------------------------
@@ -1067,10 +1055,6 @@ void MainWindow::applyActionX()
//------------------------------------------------------------------------
void MainWindow::closeActionX()
{
- QDateTime wt= upgrade->getUpgradeWarningTime();
- if (wt.isValid()) {
- babelData_.upgradeCheckTime_ = wt;
- }
babelData_.runCount_++;
QDateTime now = QDateTime::currentDateTime();
diff --git a/gui/mainwinui.ui b/gui/mainwinui.ui
index f5765e10..4533f234 100644
--- a/gui/mainwinui.ui
+++ b/gui/mainwinui.ui
@@ -691,7 +691,6 @@
<addaction name="actionHelp"/>
<addaction name="separator"/>
<addaction name="actionAbout"/>
- <addaction name="actionUpgradeCheck"/>
<addaction name="separator"/>
<addaction name="actionVisit_Website"/>
<addaction name="actionMake_a_Donation"/>
@@ -720,11 +719,6 @@
<string>Preferences...</string>
</property>
</action>
- <action name="actionUpgradeCheck">
- <property name="text">
- <string>Check for Upgrade</string>
- </property>
- </action>
<action name="actionVisit_Website">
<property name="text">
<string>Visit Website...</string>
diff --git a/gui/preferences.cc b/gui/preferences.cc
index f648324b..ea398f7c 100644
--- a/gui/preferences.cc
+++ b/gui/preferences.cc
@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent, QList<Format>& formatList,
{
ui_.setupUi(this);
- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_);
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.
@@ -85,7 +84,6 @@ void Preferences::acceptClicked()
formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
}
- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked();
babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked();
babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked();
accept();
diff --git a/gui/preferences.ui b/gui/preferences.ui
index 3bea6c2c..48f5deb3 100644
--- a/gui/preferences.ui
+++ b/gui/preferences.ui
@@ -39,13 +39,6 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QCheckBox" name="startupCheck">
- <property name="text">
- <string>Check for newer version on start.</string>
- </property>
- </widget>
- </item>
<item>
<widget class="QCheckBox" name="reportStatisticsCheck">
<property name="text">
--
2.24.1
|
GitWeb