[vidalia-svn] r1959: Pick better names for a couple of the 'Network' config page (in trunk: . src/gui/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-09-30 19:21:51 -0400 (Sun, 30 Sep 2007)
New Revision: 1959

Modified:
   trunk/
   trunk/src/gui/config/networkpage.ui
Log:
 r1987@lysithea:  edmanm | 2007-09-30 17:14:11 -0400
 Pick better names for a couple of the 'Network' config page widgets and make
 the checkboxes checked by default in the .ui file, since the groups are all
 initially visible. (Note: This does *not* mean all of these settings will be
 enabled by default; they may be hidden/disabled when the saved settings are
 loaded.)



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

Modified: trunk/src/gui/config/networkpage.ui
===================================================================
--- trunk/src/gui/config/networkpage.ui	2007-09-30 02:19:13 UTC (rev 1958)
+++ trunk/src/gui/config/networkpage.ui	2007-09-30 23:21:51 UTC (rev 1959)
@@ -29,6 +29,9 @@
      <property name="text" >
       <string>I use a proxy to access the Internet</string>
      </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
@@ -178,7 +181,7 @@
       <string>My firewall only lets me connect to certain ports</string>
      </property>
      <property name="checked" >
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -209,14 +212,14 @@
        <number>6</number>
       </property>
       <item>
-       <widget class="QLabel" name="lblAllowedPorts" >
+       <widget class="QLabel" name="lblReachablePorts" >
         <property name="text" >
          <string>Allowed Ports:</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLineEdit" name="lineAllowedPorts" >
+       <widget class="QLineEdit" name="lineReachablePorts" >
         <property name="inputMask" >
          <string/>
         </property>
@@ -229,10 +232,13 @@
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="chkUseBridge" >
+    <widget class="QCheckBox" name="chkUseBridges" >
      <property name="text" >
       <string>My ISP blocks connections to the Tor network</string>
      </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
    <item>
@@ -399,34 +405,34 @@
    </hints>
   </connection>
   <connection>
-   <sender>chkUseBridge</sender>
+   <sender>chkUseProxy</sender>
    <signal>toggled(bool)</signal>
-   <receiver>grpBridgeSettings</receiver>
+   <receiver>grpProxySettings</receiver>
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
      <x>222</x>
-     <y>305</y>
+     <y>143</y>
     </hint>
     <hint type="destinationlabel" >
      <x>222</x>
-     <y>390</y>
+     <y>216</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>chkUseProxy</sender>
+   <sender>chkUseBridges</sender>
    <signal>toggled(bool)</signal>
-   <receiver>grpProxySettings</receiver>
+   <receiver>grpBridgeSettings</receiver>
    <slot>setVisible(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>222</x>
-     <y>143</y>
+     <x>283</x>
+     <y>302</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>222</x>
-     <y>216</y>
+     <x>283</x>
+     <y>419</y>
     </hint>
    </hints>
   </connection>