[vidalia-svn] r2592: Add a "Test" button next to the UPnP checkbox. (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-20 01:10:19 -0400 (Tue, 20 May 2008)
New Revision: 2592

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/serverpage.h
   vidalia/branches/upnp/src/vidalia/config/serverpage.ui
Log:
 r343@thebe:  edmanm | 2008-05-20 01:10:58 -0400
 Add a "Test" button next to the UPnP checkbox.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r343] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/src/vidalia/config/serverpage.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serverpage.h	2008-05-20 04:51:29 UTC (rev 2591)
+++ vidalia/branches/upnp/src/vidalia/config/serverpage.h	2008-05-20 05:10:19 UTC (rev 2592)
@@ -61,8 +61,8 @@
   void bandwidthHelp();
   /** Called when the user clicks the exit policy help button */
   void exitPolicyHelp();
-	/** Called when the user selects a new value from the rate combo box */
-	void rateChanged(int rate);
+  /** Called when the user selects a new value from the rate combo box */
+  void rateChanged(int rate);
   /** Called when the user edits the max or average bandwidth limits. */
   void customRateChanged();
   /** Called when Vidalia has authenticated to Tor. If the user's Tor is not

Modified: vidalia/branches/upnp/src/vidalia/config/serverpage.ui
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serverpage.ui	2008-05-20 04:51:29 UTC (rev 2591)
+++ vidalia/branches/upnp/src/vidalia/config/serverpage.ui	2008-05-20 05:10:19 UTC (rev 2592)
@@ -127,7 +127,7 @@
             </property>
            </spacer>
           </item>
-          <item row="4" column="0" colspan="8" >
+          <item row="4" column="0" colspan="6" >
            <widget class="QCheckBox" name="chkEnableUpnp" >
             <property name="contextMenuPolicy" >
              <enum>Qt::NoContextMenu</enum>
@@ -140,6 +140,36 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="6" >
+           <layout class="QHBoxLayout" >
+            <property name="margin" >
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QPushButton" name="btnTestUPNP" >
+              <property name="contextMenuPolicy" >
+               <enum>Qt::NoContextMenu</enum>
+              </property>
+              <property name="text" >
+               <string>Test</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
           <item row="1" column="1" colspan="7" >
            <widget class="QLineEdit" name="lineServerContact" >
             <property name="cursor" >