[vidalia-svn] r2685: Add a help button next to the UPnP "Test" button too. (We ne (in vidalia: . trunk/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-10 01:22:58 -0400 (Tue, 10 Jun 2008)
New Revision: 2685

Modified:
   vidalia/
   vidalia/trunk/src/vidalia/config/serverpage.cpp
   vidalia/trunk/src/vidalia/config/serverpage.ui
Log:
 r500@thebe:  edmanm | 2008-06-10 01:23:24 -0400
 Add a help button next to the UPnP "Test" button too. (We need to make the
 help buttons sprinkled on the server page less gaudy. Just a clickable icon
 with no big button maybe?)



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

Modified: vidalia/trunk/src/vidalia/config/serverpage.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/serverpage.cpp	2008-06-10 04:50:15 UTC (rev 2684)
+++ vidalia/trunk/src/vidalia/config/serverpage.cpp	2008-06-10 05:22:58 UTC (rev 2685)
@@ -76,6 +76,7 @@
   /* Bind events to actions */
   connect(ui.btnRateHelp, SIGNAL(clicked()), this, SLOT(bandwidthHelp()));
   connect(ui.btnExitHelp, SIGNAL(clicked()), this, SLOT(exitPolicyHelp()));
+  connect(ui.btnUpnpHelp, SIGNAL(clicked()), this, SLOT(upnpHelp()));
   connect(ui.cmboRate, SIGNAL(currentIndexChanged(int)),
                  this, SLOT(rateChanged(int)));
   connect(ui.lineAvgRateLimit, SIGNAL(editingFinished()), 

Modified: vidalia/trunk/src/vidalia/config/serverpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/serverpage.ui	2008-06-10 04:50:15 UTC (rev 2684)
+++ vidalia/trunk/src/vidalia/config/serverpage.ui	2008-06-10 05:22:58 UTC (rev 2685)
@@ -156,6 +156,28 @@
              </widget>
             </item>
             <item>
+             <widget class="QToolButton" name="btnUpnpHelp" >
+              <property name="contextMenuPolicy" >
+               <enum>Qt::NoContextMenu</enum>
+              </property>
+              <property name="toolTip" >
+               <string>Show help topic on port forwarding</string>
+              </property>
+              <property name="text" >
+               <string/>
+              </property>
+              <property name="icon" >
+               <iconset resource="../res/vidalia.qrc">:/images/22x22/system-help.png</iconset>
+              </property>
+              <property name="iconSize" >
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
+              </property>
+             </widget>
+            </item> 
+            <item>
              <spacer>
               <property name="orientation" >
                <enum>Qt::Horizontal</enum>