Index: src/app/qgsoptions.cpp
===================================================================
--- src/app/qgsoptions.cpp	(revision 9697)
+++ src/app/qgsoptions.cpp	(working copy)
@@ -56,10 +56,15 @@
   QgsDebugMsg( QString( "Standard Identify radius setting read from settings file: %1" ).arg( identifyValue ) );
   spinBoxIdentifyValue->setValue( identifyValue );
 
+  //Add proxy types to leProxyType comboBox
+  leProxyType->addItem( "http" );
+  leProxyType->addItem( "socks5" );
+
   //Web proxy settings
   grpProxy->setChecked( settings.value( "proxy/proxyEnabled", "0" ).toBool() );
   leProxyHost->setText( settings.value( "proxy/proxyHost", "" ).toString() );
   leProxyPort->setText( settings.value( "proxy/proxyPort", "" ).toString() );
+  leProxyType->setCurrentIndex( settings.value( "proxy/proxyType", "" ).toInt() );
   leProxyUser->setText( settings.value( "proxy/proxyUser", "" ).toString() );
   leProxyPassword->setText( settings.value( "proxy/proxyPassword", "" ).toString() );
   // set the current theme
@@ -258,6 +263,7 @@
   settings.setValue( "proxy/proxyEnabled", grpProxy->isChecked() );
   settings.setValue( "proxy/proxyHost", leProxyHost->text() );
   settings.setValue( "proxy/proxyPort", leProxyPort->text() );
+  settings.setValue( "proxy/proxyType", leProxyType->currentIndex() );
   settings.setValue( "proxy/proxyUser", leProxyUser->text() );
   settings.setValue( "proxy/proxyPassword", leProxyPassword->text() );
   //general settings