From 1c63a90e1a68ec0abee99e03d6b9a8299056a6a9 Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Thu, 15 Oct 2015 11:33:48 +0200
Subject: [PATCH] SBI_Proxy: Remove option to set NoProxy

QtWebEngine doesn't support NoProxy option, it will always
try to use SystemProxy if no proxy is specified
---
 .../StatusBarIcons/sbi_proxywidget.cpp        | 10 ++-------
 src/plugins/StatusBarIcons/sbi_proxywidget.ui | 21 +++++++------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/plugins/StatusBarIcons/sbi_proxywidget.cpp b/src/plugins/StatusBarIcons/sbi_proxywidget.cpp
index f3fa8fd0f..59f3640b2 100644
--- a/src/plugins/StatusBarIcons/sbi_proxywidget.cpp
+++ b/src/plugins/StatusBarIcons/sbi_proxywidget.cpp
@@ -34,7 +34,7 @@ void SBI_ProxyWidget::clear()
     ui->proxyPassword->clear();
 
     ui->proxyType->setCurrentIndex(0);
-    ui->noProxy->setChecked(true);
+    ui->systemProxy->setChecked(true);
 }
 
 SBI_NetworkProxy* SBI_ProxyWidget::getProxy() const
@@ -46,10 +46,8 @@ SBI_NetworkProxy* SBI_ProxyWidget::getProxy() const
     proxy->setUserName(ui->proxyUsername->text());
     proxy->setPassword(ui->proxyPassword->text());
 
-    if (ui->noProxy->isChecked()) {
+    if (ui->systemProxy->isChecked()) {
         proxy->setType(QNetworkProxy::NoProxy);
-    } else if (ui->systemProxy->isChecked()) {
-        proxy->setType(QNetworkProxy::DefaultProxy);
     } else {
         proxy->setType(ui->proxyType->currentIndex() == 0 ? QNetworkProxy::HttpProxy : QNetworkProxy::Socks5Proxy);
     }
@@ -67,10 +65,6 @@ void SBI_ProxyWidget::setProxy(const SBI_NetworkProxy &proxy)
 
     switch (proxy.type()) {
     case QNetworkProxy::NoProxy:
-        ui->noProxy->setChecked(true);
-        break;
-
-    case QNetworkProxy::DefaultProxy:
         ui->systemProxy->setChecked(true);
         break;
 
diff --git a/src/plugins/StatusBarIcons/sbi_proxywidget.ui b/src/plugins/StatusBarIcons/sbi_proxywidget.ui
index 876d288c2..8a5c8a6cd 100644
--- a/src/plugins/StatusBarIcons/sbi_proxywidget.ui
+++ b/src/plugins/StatusBarIcons/sbi_proxywidget.ui
@@ -14,14 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="2">
-    <widget class="QRadioButton" name="noProxy">
-     <property name="text">
-      <string>Do &amp;not use proxy</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
+   <item row="2" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_9">
      <item>
       <widget class="QComboBox" name="proxyType">
@@ -59,7 +52,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
+   <item row="2" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -75,7 +68,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="1">
+   <item row="3" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_24">
      <item>
       <widget class="QLabel" name="label_56">
@@ -112,21 +105,21 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="0" column="0" colspan="2">
     <widget class="QRadioButton" name="systemProxy">
      <property name="text">
       <string>S&amp;ystem proxy configuration</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="1" column="0" colspan="2">
     <widget class="QRadioButton" name="manualProxy">
      <property name="text">
       <string>&amp;Manual configuration</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
+   <item row="6" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -139,7 +132,7 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="1">
+   <item row="5" column="1">
     <widget class="QFrame" name="httpsCredentialsLayout_2">
      <layout class="QHBoxLayout" name="httpsCredentialsLayout"/>
     </widget>