Remove proxy username/password in settings dialog

Change-Id: Id769f7a0453505d53419e80aea0deb7be6f55b79
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>

2 files changed, 127 insertions, 428 deletions

diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp
index a4b958c1c..3281cc45d 100644
--- a/src/sdk/settingsdialog.cpp
+++ b/src/sdk/settingsdialog.cpp
@@ -222,16 +222,10 @@ SettingsDialog::SettingsDialog(PackageManagerCore *core, QWidget *parent)
     const QNetworkProxy &ftpProxy = settings.ftpProxy();
     m_ui->m_ftpProxy->setText(ftpProxy.hostName());
     m_ui->m_ftpProxyPort->setValue(ftpProxy.port());
-    m_ui->m_ftpProxyUser->setText(ftpProxy.user());
-    m_ui->m_ftpProxyPass->setText(ftpProxy.password());
-    m_ui->m_ftpProxyNeedsAuth->setChecked(!ftpProxy.user().isEmpty() | !ftpProxy.password().isEmpty());
 
     const QNetworkProxy &httpProxy = settings.httpProxy();
     m_ui->m_httpProxy->setText(httpProxy.hostName());
     m_ui->m_httpProxyPort->setValue(httpProxy.port());
-    m_ui->m_httpProxyUser->setText(httpProxy.user());
-    m_ui->m_httpProxyPass->setText(httpProxy.password());
-    m_ui->m_httpProxyNeedsAuth->setChecked(!httpProxy.user().isEmpty() | !httpProxy.password().isEmpty());
 
     connect(m_ui->m_addRepository, SIGNAL(clicked()), this, SLOT(addRepository()));
     connect(m_ui->m_showPasswords, SIGNAL(clicked()), this, SLOT(updatePasswords()));
@@ -284,12 +278,12 @@ void SettingsDialog::accept()
     if (newSettings.proxyType() == Settings::UserDefinedProxy) {
         // update ftp proxy settings
         newSettings.setFtpProxy(QNetworkProxy(QNetworkProxy::HttpProxy, m_ui->m_ftpProxy->text(),
-            m_ui->m_ftpProxyPort->value(), m_ui->m_ftpProxyUser->text(), m_ui->m_ftpProxyPass->text()));
+            m_ui->m_ftpProxyPort->value()));
         settingsChanged |= (settings.ftpProxy() != newSettings.ftpProxy());
 
         // update http proxy settings
         newSettings.setHttpProxy(QNetworkProxy(QNetworkProxy::HttpProxy, m_ui->m_httpProxy->text(),
-            m_ui->m_httpProxyPort->value(), m_ui->m_httpProxyUser->text(), m_ui->m_httpProxyPass->text()));
+            m_ui->m_httpProxyPort->value()));
         settingsChanged |= (settings.httpProxy() != newSettings.httpProxy());
     }
 
diff --git a/src/sdk/settingsdialog.ui b/src/sdk/settingsdialog.ui
index d3ca959a6..3683f3cd1 100644
--- a/src/sdk/settingsdialog.ui
+++ b/src/sdk/settingsdialog.ui
@@ -56,253 +56,118 @@
        </item>
        <item>
         <widget class="QWidget" name="m_rootWidget" native="true">
-         <layout class="QVBoxLayout" name="verticalLayout_6">
-          <property name="topMargin">
-           <number>0</number>
-          </property>
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <property name="bottomMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <layout class="QVBoxLayout" name="m_httpRootLayout">
-            <item>
-             <layout class="QHBoxLayout" name="m_httpProxyLayout">
-              <item>
-               <widget class="QLabel" name="m_httpProxyLabel">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="text">
-                 <string>HTTP proxy:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="m_httpProxy">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLabel" name="m_httpProxyPortLabel">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="text">
-                 <string>Port:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QSpinBox" name="m_httpProxyPort">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="maximum">
-                 <number>65535</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="m_httpProxyNeedsAuth">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>HTTP proxy requires authentication</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QWidget" name="m_httpAuthWidget" native="true">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <layout class="QGridLayout" name="gridLayout_2">
-               <property name="topMargin">
-                <number>0</number>
-               </property>
-               <property name="rightMargin">
-                <number>0</number>
-               </property>
-               <property name="bottomMargin">
-                <number>0</number>
-               </property>
-               <item row="0" column="0">
-                <widget class="QLabel" name="m_httpProxyUserLabel">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                 <property name="text">
-                  <string>Username:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="m_httpProxyUser">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="m_httpProxyPassLabel">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                 <property name="text">
-                  <string>Password:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="m_httpProxyPass">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                 <property name="echoMode">
-                  <enum>QLineEdit::Password</enum>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="m_httpProxyLabel">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>HTTP proxy:</string>
+            </property>
+           </widget>
           </item>
-          <item>
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="m_httpProxy">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QLabel" name="m_httpProxyPortLabel">
+            <property name="enabled">
+             <bool>false</bool>
             </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>10</width>
-              <height>10</height>
-             </size>
+            <property name="text">
+             <string>Port:</string>
             </property>
-           </spacer>
+           </widget>
+          </item>
+          <item row="0" column="3">
+           <widget class="QSpinBox" name="m_httpProxyPort">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="maximum">
+             <number>65535</number>
+            </property>
+           </widget>
           </item>
-          <item>
-           <layout class="QVBoxLayout" name="m_ftpRootLayout">
-            <item>
-             <layout class="QHBoxLayout" name="m_ftpProxyLayout">
-              <item>
-               <widget class="QLabel" name="m_ftpProxyLabel">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="text">
-                 <string>FTP proxy:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="m_ftpProxy">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLabel" name="m_ftpProxyPortLabel">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="text">
-                 <string>Port:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QSpinBox" name="m_ftpProxyPort">
-                <property name="enabled">
-                 <bool>false</bool>
-                </property>
-                <property name="maximum">
-                 <number>65535</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <widget class="QCheckBox" name="m_ftpProxyNeedsAuth">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>FTP proxy requires authentication</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QWidget" name="m_ftpAuthWidget" native="true">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <layout class="QGridLayout" name="gridLayout">
-               <property name="topMargin">
-                <number>0</number>
-               </property>
-               <property name="rightMargin">
-                <number>0</number>
-               </property>
-               <property name="bottomMargin">
-                <number>0</number>
-               </property>
-               <item row="0" column="0">
-                <widget class="QLabel" name="m_ftpProxyUserLabel">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                 <property name="text">
-                  <string>Username:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="0" column="1">
-                <widget class="QLineEdit" name="m_ftpProxyUser">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="0">
-                <widget class="QLabel" name="m_ftpProxyPassLabel">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                 <property name="text">
-                  <string>Password:</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="1" column="1">
-                <widget class="QLineEdit" name="m_ftpProxyPass">
-                 <property name="enabled">
-                  <bool>false</bool>
-                 </property>
-                 <property name="echoMode">
-                  <enum>QLineEdit::Password</enum>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
+          <item row="1" column="0">
+           <widget class="QWidget" name="m_httpAuthWidget" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_2">
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+            </layout>
+           </widget>
           </item>
-          <item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="m_ftpProxyLabel">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>FTP proxy:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="m_ftpProxy">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="QLabel" name="m_ftpProxyPortLabel">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Port:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3">
+           <widget class="QSpinBox" name="m_ftpProxyPort">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="maximum">
+             <number>65535</number>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QWidget" name="m_ftpAuthWidget" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayout">
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
+              <number>0</number>
+             </property>
+            </layout>
+           </widget>
+          </item>
+          <item row="3" column="2">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -478,22 +343,6 @@
   <connection>
    <sender>m_manualProxySettings</sender>
    <signal>toggled(bool)</signal>
-   <receiver>m_httpProxyPortLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>349</x>
-     <y>78</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>347</x>
-     <y>96</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_manualProxySettings</sender>
-   <signal>toggled(bool)</signal>
    <receiver>m_httpProxyPort</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
@@ -510,32 +359,16 @@
   <connection>
    <sender>m_manualProxySettings</sender>
    <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>61</x>
-     <y>76</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>109</x>
-     <y>243</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_manualProxySettings</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxy</receiver>
+   <receiver>m_httpProxyPortLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>204</x>
+     <x>349</x>
      <y>78</y>
     </hint>
     <hint type="destinationlabel">
-     <x>203</x>
-     <y>248</y>
+     <x>347</x>
+     <y>96</y>
     </hint>
    </hints>
   </connection>
@@ -558,48 +391,48 @@
   <connection>
    <sender>m_manualProxySettings</sender>
    <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyPort</receiver>
+   <receiver>m_ftpProxyLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>406</x>
-     <y>78</y>
+     <x>61</x>
+     <y>76</y>
     </hint>
     <hint type="destinationlabel">
-     <x>380</x>
-     <y>252</y>
+     <x>109</x>
+     <y>243</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_manualProxySettings</sender>
    <signal>toggled(bool)</signal>
-   <receiver>m_httpProxyNeedsAuth</receiver>
+   <receiver>m_ftpProxy</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>53</x>
-     <y>75</y>
+     <x>204</x>
+     <y>78</y>
     </hint>
     <hint type="destinationlabel">
-     <x>100</x>
-     <y>129</y>
+     <x>203</x>
+     <y>248</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>m_manualProxySettings</sender>
    <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyNeedsAuth</receiver>
+   <receiver>m_ftpProxyPort</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>88</x>
-     <y>74</y>
+     <x>406</x>
+     <y>78</y>
     </hint>
     <hint type="destinationlabel">
-     <x>95</x>
-     <y>274</y>
+     <x>380</x>
+     <y>252</y>
     </hint>
    </hints>
   </connection>
@@ -635,133 +468,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>m_ftpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyUserLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>82</x>
-     <y>283</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>77</x>
-     <y>303</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_ftpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyUser</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>180</x>
-     <y>284</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>170</x>
-     <y>304</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_ftpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyPass</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>224</x>
-     <y>283</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>223</x>
-     <y>330</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_ftpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_ftpProxyPassLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>317</x>
-     <y>282</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>122</x>
-     <y>335</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_httpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_httpProxyUserLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>81</x>
-     <y>134</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>70</x>
-     <y>154</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_httpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_httpProxyPassLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>87</x>
-     <y>137</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>84</x>
-     <y>186</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_httpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_httpProxyUser</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>183</x>
-     <y>135</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>182</x>
-     <y>154</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_httpProxyNeedsAuth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_httpProxyPass</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>287</x>
-     <y>134</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>285</x>
-     <y>182</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>