Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show warning message for enabling update checks with no-update config #4182

Merged
merged 2 commits into from
May 24, 2020
Merged

Show warning message for enabling update checks with no-update config #4182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8029bd
src/mumble/NetworkConfig: Show warning message for enabling update ch…
Krzmbrzl May 17, 2020
04cefdb
Translation update
Krzmbrzl May 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/mumble/NetworkConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <QtNetwork/QHostAddress>
#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QNetworkAccessManager>
#include <QSignalBlocker>

// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
#include "Global.h"
Expand Down Expand Up @@ -62,6 +63,7 @@ void NetworkConfig::load(const Settings &r) {

loadCheckBox(qcbHideOS, s.bHideOS);

const QSignalBlocker blocker(qcbAutoUpdate);
loadCheckBox(qcbAutoUpdate, r.bUpdateCheck);
loadCheckBox(qcbPluginUpdate, r.bPluginCheck);
loadCheckBox(qcbUsage, r.bUsage);
Expand Down Expand Up @@ -144,6 +146,23 @@ void NetworkConfig::on_qcbType_currentIndexChanged(int v) {
s.ptProxyType = pt;
}

#ifdef NO_UPDATE_CHECK
void NetworkConfig::on_qcbAutoUpdate_stateChanged(int state) {
if (state == Qt::Checked) {
QMessageBox msgBox;
msgBox.setText(QObject::tr("<p>You're using a Mumble version that <b>explicitly disabled</b> update-checks.<p>"
"<p>This means that the update notification you might receive by using this option will "
"<b>most likely be meaningless</b> for you.<p>"));
msgBox.setInformativeText(QObject::tr("<p>If you're using Linux this is most likely because you are using a "
"version from your distribution's package repository that have their own update cycles.</p>"
"<p>If you want to always have the most recent Mumble version, you should consider using a different method of installation.\n"
"See <a href=\"https://wiki.mumble.info/wiki/Installing_Mumble\">the Mumble wiki</a> for what alternatives there are.</p>"));
msgBox.setIcon(QMessageBox::Warning);
msgBox.exec();
}
}
#endif

QNetworkReply *Network::get(const QUrl &url) {
QNetworkRequest req(url);
prepareRequest(req);
Expand Down
3 changes: 3 additions & 0 deletions src/mumble/NetworkConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ class NetworkConfig : public ConfigWidget, Ui::NetworkConfig {
void load(const Settings &r) Q_DECL_OVERRIDE;

void on_qcbType_currentIndexChanged(int v);
#ifdef NO_UPDATE_CHECK
void on_qcbAutoUpdate_stateChanged(int state);
#endif
};

namespace Network {
Expand Down
9 changes: 9 additions & 0 deletions src/mumble/mumble_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6561,6 +6561,15 @@ Mixed echo cancellation mixes all speaker outputs in one mono stream and passes
Multichannel echo cancellation requires more CPU, so you should try mixed first</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;You&apos;re using a Mumble version that &lt;b&gt;explicitly disabled&lt;/b&gt; update-checks.&lt;p&gt;&lt;p&gt;This means that the update notification you might receive by using this option will &lt;b&gt;most likely be meaningless&lt;/b&gt; for you.&lt;p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;p&gt;If you&apos;re using Linux this is most likely because you are using a version from your distribution&apos;s package repository that have their own update cycles.&lt;/p&gt;&lt;p&gt;If you want to always have the most recent Mumble version, you should consider using a different method of installation.
See &lt;a href=&quot;https://wiki.mumble.info/wiki/Installing_Mumble&quot;&gt;the Mumble wiki&lt;/a&gt; for what alternatives there are.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RichTextEditor</name>
Expand Down