diff gui/src/ResourceManager.cpp @ 13609:b355901aade4

Added username and password field to proxy settings.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Wed, 17 Aug 2011 01:42:00 +0200
parents fd31226d4c3a
children 8728061cd0ec
line wrap: on
line diff
--- a/gui/src/ResourceManager.cpp
+++ b/gui/src/ResourceManager.cpp
@@ -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);
 }