[vidalia-svn] r2565: Add a checkbox for toggling UPnP. We may want to think of a (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-09 00:31:18 -0400 (Fri, 09 May 2008)
New Revision: 2565

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/serverpage.cpp
   vidalia/branches/upnp/src/vidalia/config/serverpage.ui
Log:
 r289@thebe:  edmanm | 2008-05-09 00:31:56 -0400
 Add a checkbox for toggling UPnP. We may want to think of a better label for
 the checkbox, since "port forwarding" might be confusing to some.



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

Modified: vidalia/branches/upnp/src/vidalia/config/serverpage.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serverpage.cpp	2008-05-09 00:01:38 UTC (rev 2564)
+++ vidalia/branches/upnp/src/vidalia/config/serverpage.cpp	2008-05-09 04:31:18 UTC (rev 2565)
@@ -18,6 +18,7 @@
 #include <vidalia.h>
 #include <vmessagebox.h>
 #include <html.h>
+#include <config.h>
 
 #include "configdialog.h"
 #include "serverpage.h"
@@ -98,6 +99,10 @@
     new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
   ui.lineMaxRateLimit->setValidator(
     new QIntValidator(MIN_BANDWIDTH_RATE, MAX_BANDWIDTH_RATE, this));
+
+#ifndef USE_MINIUPNPC
+  ui.chkEnableUpnp->setVisible(false);
+#endif
 }
 
 /** Destructor */

Modified: vidalia/branches/upnp/src/vidalia/config/serverpage.ui
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serverpage.ui	2008-05-09 00:01:38 UTC (rev 2564)
+++ vidalia/branches/upnp/src/vidalia/config/serverpage.ui	2008-05-09 04:31:18 UTC (rev 2565)
@@ -127,6 +127,19 @@
             </property>
            </spacer>
           </item>
+          <item row="4" column="0" colspan="8" >
+           <widget class="QCheckBox" name="chkEnableUpnp" >
+            <property name="contextMenuPolicy" >
+             <enum>Qt::NoContextMenu</enum>
+            </property>
+            <property name="toolTip" >
+             <string></string>
+            </property>
+            <property name="text" >
+             <string>Attempt to automatically configure port forwarding</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1" colspan="7" >
            <widget class="QLineEdit" name="lineServerContact" >
             <property name="cursor" >