Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2018-04-16 16:37:28 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-06-06 21:11:09 +0300
commite1ab5f3811013ae7b69d3f1c30590237611a8528 (patch)
treeb67d6cb66830fc4ea3d364b14afc62db72dd07c5 /src/gui/networksettings.cpp
parent33b6d0473a05b7d6da13e26d8b987706fe735a0c (diff)
Network settings: If no proxy host given, show "no proxy" #5885
What happens internally is that a proxy without a hostname gets treated as no proxy.
Diffstat (limited to 'src/gui/networksettings.cpp')
-rw-r--r--src/gui/networksettings.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp
index 6305dc3a3..2ca2eac46 100644
--- a/src/gui/networksettings.cpp
+++ b/src/gui/networksettings.cpp
@@ -217,4 +217,16 @@ void NetworkSettings::checkEmptyProxyHost()
}
}
+void NetworkSettings::showEvent(QShowEvent *event)
+{
+ if (!event->spontaneous()
+ && _ui->manualProxyRadioButton->isChecked()
+ && _ui->hostLineEdit->text().isEmpty()) {
+ _ui->noProxyRadioButton->setChecked(true);
+ checkEmptyProxyHost();
+ }
+
+ QWidget::showEvent(event);
+}
+
} // namespace OCC