# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1313538120 -7200
# Node ID b355901aade4cba93e29866c49740ba6f616f4e8
# Parent  d3527a9dfe2770cd18eebcbd6ae438e63d83f441
Added username and password field to proxy settings.

diff -r d3527a9dfe27 -r b355901aade4 gui/src/ResourceManager.cpp
--- a/gui/src/ResourceManager.cpp	Wed Aug 17 01:18:57 2011 +0200
+++ b/gui/src/ResourceManager.cpp	Wed Aug 17 01:42:00 2011 +0200
@@ -72,15 +72,7 @@
   if (m_settings->value ("useProxyServer").toBool ())
     {
       QString proxyTypeString = m_settings->value ("proxyType").toString ();
-      if (proxyTypeString == "NoProxy")
-        {
-          proxyType = QNetworkProxy::NoProxy;
-        }
-      else if (proxyTypeString == "DefaultProxy")
-        {
-          proxyType = QNetworkProxy::DefaultProxy;
-        }
-      else if (proxyTypeString == "Socks5Proxy")
+      if (proxyTypeString == "Socks5Proxy")
         {
           proxyType = QNetworkProxy::Socks5Proxy;
         }
@@ -88,19 +80,13 @@
         {
           proxyType = QNetworkProxy::HttpProxy;
         }
-      else if (proxyTypeString == "HttpCachingProxy")
-        {
-          proxyType = QNetworkProxy::HttpCachingProxy;
-        }
-      else if (proxyTypeString == "FtpCachingProxy")
-        {
-          proxyType = QNetworkProxy::FtpCachingProxy;
-        }
     }
 
   QNetworkProxy proxy;
   proxy.setType (proxyType);
   proxy.setHostName (m_settings->value ("proxyHostName").toString ());
   proxy.setPort (m_settings->value ("proxyPort").toInt ());
+  proxy.setUser (m_settings->value ("proxyUserName").toString ());
+  proxy.setPassword (m_settings->value ("proxyPassword").toString ());
   QNetworkProxy::setApplicationProxy (proxy);
 }
diff -r d3527a9dfe27 -r b355901aade4 gui/src/SettingsDialog.cpp
--- a/gui/src/SettingsDialog.cpp	Wed Aug 17 01:18:57 2011 +0200
+++ b/gui/src/SettingsDialog.cpp	Wed Aug 17 01:42:00 2011 +0200
@@ -34,6 +34,8 @@
     }
 
   ui->proxyPort->setText (settings->value ("proxyPort").toString ());
+  ui->proxyUserName->setText (settings->value ("proxyUserName").toString ());
+  ui->proxyPassword->setText (settings->value ("proxyPassword").toString ());
 }
 
 SettingsDialog::~SettingsDialog ()
@@ -56,5 +58,7 @@
   settings->setValue ("proxyType", ui->proxyType->currentText ());
   settings->setValue ("proxyHostName", ui->proxyHostName->text ());
   settings->setValue ("proxyPort", ui->proxyPort->text ());
+  settings->setValue ("proxyUserName", ui->proxyUserName->text ());
+  settings->setValue ("proxyPassword", ui->proxyPassword->text ());
   delete ui;
 }
diff -r d3527a9dfe27 -r b355901aade4 gui/src/SettingsDialog.ui
--- a/gui/src/SettingsDialog.ui	Wed Aug 17 01:18:57 2011 +0200
+++ b/gui/src/SettingsDialog.ui	Wed Aug 17 01:42:00 2011 +0200
@@ -241,16 +241,6 @@
            </property>
            <item>
             <property name="text">
-             <string>NoProxy</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>DefaultProxy</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
              <string>HttpProxy</string>
             </property>
            </item>
@@ -259,16 +249,6 @@
              <string>Socks5Proxy</string>
             </property>
            </item>
-           <item>
-            <property name="text">
-             <string>HttpCachingProxy</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>FtpCachingProxy</string>
-            </property>
-           </item>
           </widget>
          </item>
          <item row="1" column="0">
@@ -305,6 +285,43 @@
            </property>
           </widget>
          </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label_6">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="text">
+            <string>Username:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QLineEdit" name="proxyUserName">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="label_7">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="text">
+            <string>Password:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <widget class="QLineEdit" name="proxyPassword">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="echoMode">
+            <enum>QLineEdit::Password</enum>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
@@ -490,5 +507,69 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>useProxyServer</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>proxyUserName</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>291</x>
+     <y>190</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useProxyServer</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>proxyPassword</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>291</x>
+     <y>223</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useProxyServer</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>label_6</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>56</x>
+     <y>190</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>useProxyServer</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>label_7</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>249</x>
+     <y>59</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>55</x>
+     <y>223</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>