Index: python/plugins/plugin_installer/installer_data.py
===================================================================
--- python/plugins/plugin_installer/installer_data.py	(revision 9681)
+++ python/plugins/plugin_installer/installer_data.py	(working copy)
@@ -84,7 +84,10 @@
     settings.beginGroup("proxy")
     if settings.value("/proxyEnabled").toBool():
       self.proxy=QNetworkProxy()
-      self.proxy.setType(QNetworkProxy.HttpProxy)
+      if settings.value( "/proxyType").toInt()[0] == 1:
+      	self.proxy.setType( QNetworkProxy.Socks5Proxy )
+      else:
+      	self.proxy.setType( QNetworkProxy.HttpProxy )
       self.proxy.setHostName(settings.value("/proxyHost").toString())
       self.proxy.setPort(settings.value("/proxyPort").toUInt()[0])
       self.proxy.setUser(settings.value("/proxyUser").toString())
Index: src/ui/qgsoptionsbase.ui
===================================================================
--- src/ui/qgsoptionsbase.ui	(revision 9681)
+++ src/ui/qgsoptionsbase.ui	(working copy)
@@ -6,14 +6,15 @@
     <x>0</x>
     <y>0</y>
     <width>617</width>
-    <height>559</height>
+    <height>546</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>QGIS Options</string>
   </property>
   <property name="windowIcon" >
-   <iconset/>
+   <iconset>
+    <normaloff>../dev/cpp/qgis/src/ui</normaloff>../dev/cpp/qgis/src/ui</iconset>
   </property>
   <property name="sizeGripEnabled" >
    <bool>true</bool>
@@ -25,9 +26,17 @@
    <item row="0" column="0" >
     <widget class="QTabWidget" name="tabWidget" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>6</number>
      </property>
      <widget class="QWidget" name="tabGeneral" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>&amp;General</string>
       </attribute>
@@ -38,18 +47,9 @@
           <string>Project files</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>11</number>
           </property>
-          <property name="topMargin" >
-           <number>11</number>
-          </property>
-          <property name="rightMargin" >
-           <number>11</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>11</number>
-          </property>
           <item>
            <widget class="QCheckBox" name="chbAskToSaveProjectChanges" >
             <property name="text" >
@@ -88,7 +88,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -124,7 +124,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>40</width>
               <height>20</height>
@@ -228,7 +228,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>577</width>
            <height>21</height>
@@ -239,6 +239,14 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tabRendering" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>&amp;Rendering</string>
       </attribute>
@@ -295,18 +303,9 @@
           <string>Rendering quality</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>11</number>
           </property>
-          <property name="topMargin" >
-           <number>11</number>
-          </property>
-          <property name="rightMargin" >
-           <number>11</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>11</number>
-          </property>
           <item>
            <widget class="QCheckBox" name="chkAntiAliasing" >
             <property name="text" >
@@ -339,7 +338,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>20</width>
            <height>40</height>
@@ -350,40 +349,30 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tabMap" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>&amp;Map tools</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
+       <property name="margin" >
         <number>11</number>
        </property>
-       <property name="topMargin" >
-        <number>11</number>
-       </property>
-       <property name="rightMargin" >
-        <number>11</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>11</number>
-       </property>
        <item row="2" column="0" >
         <widget class="QGroupBox" name="groupBox_10" >
          <property name="title" >
           <string>Panning and zooming</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>11</number>
           </property>
-          <property name="topMargin" >
-           <number>11</number>
-          </property>
-          <property name="rightMargin" >
-           <number>11</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>11</number>
-          </property>
           <item row="0" column="1" >
            <widget class="QComboBox" name="cmbWheelAction" >
             <item>
@@ -444,24 +433,15 @@
           <string>Measure tool</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>11</number>
           </property>
-          <property name="topMargin" >
-           <number>11</number>
-          </property>
-          <property name="rightMargin" >
-           <number>11</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>11</number>
-          </property>
           <item row="1" column="2" >
            <spacer>
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>191</width>
               <height>20</height>
@@ -514,18 +494,9 @@
           <string>Search radius</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>11</number>
           </property>
-          <property name="topMargin" >
-           <number>11</number>
-          </property>
-          <property name="rightMargin" >
-           <number>11</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>11</number>
-          </property>
           <item row="1" column="0" colspan="2" >
            <widget class="QLabel" name="textLabel2" >
             <property name="text" >
@@ -570,7 +541,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>20</width>
            <height>40</height>
@@ -581,6 +552,14 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tabDigitizing" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>Digitizing</string>
       </attribute>
@@ -655,7 +634,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>311</width>
               <height>20</height>
@@ -685,7 +664,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>241</width>
               <height>20</height>
@@ -715,7 +694,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>61</width>
               <height>20</height>
@@ -754,7 +733,7 @@
             <property name="orientation" >
              <enum>Qt::Horizontal</enum>
             </property>
-            <property name="sizeHint" >
+            <property name="sizeHint" stdset="0" >
              <size>
               <width>281</width>
               <height>20</height>
@@ -780,7 +759,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>547</width>
            <height>71</height>
@@ -791,28 +770,27 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tabCRS" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>CRS</string>
       </attribute>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
+       <property name="margin" >
         <number>11</number>
        </property>
-       <property name="topMargin" >
-        <number>11</number>
-       </property>
-       <property name="rightMargin" >
-        <number>11</number>
-       </property>
-       <property name="bottomMargin" >
-        <number>11</number>
-       </property>
        <item row="3" column="0" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>51</width>
            <height>31</height>
@@ -836,18 +814,9 @@
           <string>When layer is loaded that has no coordinate reference system (CRS)</string>
          </property>
          <layout class="QVBoxLayout" >
-          <property name="leftMargin" >
+          <property name="margin" >
            <number>11</number>
           </property>
-          <property name="topMargin" >
-           <number>11</number>
-          </property>
-          <property name="rightMargin" >
-           <number>11</number>
-          </property>
-          <property name="bottomMargin" >
-           <number>11</number>
-          </property>
           <item>
            <widget class="QRadioButton" name="radPromptForProjection" >
             <property name="text" >
@@ -875,6 +844,14 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tabLocale" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>Locale</string>
       </attribute>
@@ -919,7 +896,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>501</width>
            <height>51</height>
@@ -946,10 +923,18 @@
       </layout>
      </widget>
      <widget class="QWidget" name="tab" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>595</width>
+        <height>462</height>
+       </rect>
+      </property>
       <attribute name="title" >
        <string>Proxy</string>
       </attribute>
-      <layout class="QGridLayout" >
+      <layout class="QGridLayout" name="gridLayout_2" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="grpProxy" >
          <property name="title" >
@@ -961,7 +946,7 @@
          <property name="checkable" >
           <bool>true</bool>
          </property>
-         <layout class="QGridLayout" >
+         <layout class="QGridLayout" name="gridLayout" >
           <item row="0" column="0" >
            <widget class="QLabel" name="lblProxyHost" >
             <property name="text" >
@@ -989,6 +974,30 @@
            <widget class="QLineEdit" name="leProxyPort" />
           </item>
           <item row="2" column="0" >
+           <widget class="QLabel" name="lblProxyType" >
+            <property name="text" >
+             <string>Type</string>
+            </property>
+            <property name="buddy" >
+             <cstring>leProxyPort</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="leProxyType" >
+            <item>
+             <property name="text" >
+              <string>http</string>
+             </property>
+            </item>
+            <item>
+             <property name="text" >
+              <string>socks5</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="3" column="0" >
            <widget class="QLabel" name="lblUser" >
             <property name="text" >
              <string>User</string>
@@ -998,14 +1007,14 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
+          <item row="3" column="1" >
            <widget class="QLineEdit" name="leProxyUser" >
             <property name="toolTip" >
              <string>Leave this blank if no proxy username / password are required</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" >
+          <item row="4" column="0" >
            <widget class="QLabel" name="lblPassword" >
             <property name="text" >
              <string>Password</string>
@@ -1015,7 +1024,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1" >
+          <item row="4" column="1" >
            <widget class="QLineEdit" name="leProxyPassword" >
             <property name="toolTip" >
              <string>Leave this blank if no proxy username / password are required</string>
@@ -1033,7 +1042,7 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" >
+         <property name="sizeHint" stdset="0" >
           <size>
            <width>20</width>
            <height>40</height>
@@ -1051,7 +1060,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
Index: src/app/qgsoptions.cpp
===================================================================
--- src/app/qgsoptions.cpp	(revision 9681)
+++ src/app/qgsoptions.cpp	(working copy)
@@ -60,6 +60,7 @@
   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
@@ -250,6 +251,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