[vidalia-svn] r1938: Swap the firewall settings and the proxy settings groups. (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-09-21 03:55:20 -0400 (Fri, 21 Sep 2007)
New Revision: 1938

Modified:
   trunk/
   trunk/src/gui/config/firewallpage.ui
Log:
 r1951@lysithea:  edmanm | 2007-09-21 03:55:14 -0400
 Swap the firewall settings and the proxy settings groups.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r1951] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/src/gui/config/firewallpage.ui
===================================================================
--- trunk/src/gui/config/firewallpage.ui	2007-09-21 07:41:17 UTC (rev 1937)
+++ trunk/src/gui/config/firewallpage.ui	2007-09-21 07:55:20 UTC (rev 1938)
@@ -25,86 +25,6 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="QCheckBox" name="chkFascistFirewall" >
-     <property name="contextMenuPolicy" >
-      <enum>Qt::NoContextMenu</enum>
-     </property>
-     <property name="toolTip" >
-      <string>Check to run as a Tor network server</string>
-     </property>
-     <property name="text" >
-      <string>My firewall only lets me connect to certain ports</string>
-     </property>
-     <property name="checked" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="grpFirewallSettings" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>1</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>75</height>
-      </size>
-     </property>
-     <property name="title" >
-      <string>Firewall Settings</string>
-     </property>
-     <widget class="QWidget" name="horizontalLayout" >
-      <property name="geometry" >
-       <rect>
-        <x>10</x>
-        <y>20</y>
-        <width>481</width>
-        <height>41</height>
-       </rect>
-      </property>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="lblAllowedPorts" >
-         <property name="text" >
-          <string>Allowed Ports:</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="lineAllowedPorts" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>0</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="inputMask" >
-          <string/>
-         </property>
-         <property name="text" >
-          <string>80, 443</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
     <widget class="QCheckBox" name="chkUseProxy" >
      <property name="text" >
       <string>I use a proxy to access the Internet</string>
@@ -251,6 +171,86 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="chkFascistFirewall" >
+     <property name="contextMenuPolicy" >
+      <enum>Qt::NoContextMenu</enum>
+     </property>
+     <property name="toolTip" >
+      <string>Check to run as a Tor network server</string>
+     </property>
+     <property name="text" >
+      <string>My firewall only lets me connect to certain ports</string>
+     </property>
+     <property name="checked" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="grpFirewallSettings" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>1</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>0</width>
+       <height>75</height>
+      </size>
+     </property>
+     <property name="title" >
+      <string>Firewall Settings</string>
+     </property>
+     <widget class="QWidget" name="horizontalLayout" >
+      <property name="geometry" >
+       <rect>
+        <x>10</x>
+        <y>20</y>
+        <width>481</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <layout class="QHBoxLayout" >
+       <property name="margin" >
+        <number>0</number>
+       </property>
+       <property name="spacing" >
+        <number>6</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="lblAllowedPorts" >
+         <property name="text" >
+          <string>Allowed Ports:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineAllowedPorts" >
+         <property name="sizePolicy" >
+          <sizepolicy>
+           <hsizetype>7</hsizetype>
+           <vsizetype>0</vsizetype>
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="inputMask" >
+          <string/>
+         </property>
+         <property name="text" >
+          <string>80, 443</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
     <widget class="QCheckBox" name="chkUseBridge" >
      <property name="text" >
       <string>My ISP blocks connections to the Tor network</string>