[vidalia-svn] r2480: Add a box for proxy command line arguments and change the ch (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-04-03 22:40:41 -0400 (Thu, 03 Apr 2008)
New Revision: 2480

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/config/generalpage.ui
Log:
 r304@lysithea:  edmanm | 2008-04-03 22:40:38 -0400
 Add a box for proxy command line arguments and change the checkbox to say
 "Start my proxy application when Vidalia starts". If this is unchecked, then
 we never launch their proxy.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r304] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/config/generalpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.ui	2008-04-04 01:39:32 UTC (rev 2479)
+++ vidalia/trunk/src/vidalia/config/generalpage.ui	2008-04-04 02:40:41 UTC (rev 2480)
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>499</width>
-    <height>312</height>
+    <width>496</width>
+    <height>347</height>
    </rect>
   </property>
   <property name="contextMenuPolicy" >
@@ -80,7 +80,7 @@
      <property name="minimumSize" >
       <size>
        <width>0</width>
-       <height>125</height>
+       <height>167</height>
       </size>
      </property>
      <property name="title" >
@@ -102,14 +102,28 @@
         </layout>
        </item>
        <item>
-        <widget class="QCheckBox" name="chkRunProxyAtTorStartup" >
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="lblProxyArguments" >
+           <property name="text" >
+            <string>Command Line Arguments:</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QLineEdit" name="lineProxyExecutableArguments" />
+       </item>
+       <item>
+        <widget class="QCheckBox" name="chkRunProxyAtVidaliaStartup" >
          <property name="text" >
-          <string>Start my proxy application when Tor starts</string>
+          <string>Start my proxy application when Vidalia starts</string>
          </property>
         </widget>
        </item>
       </layout>
-    </widget>
+     </widget>
    </item>
    <item>
     <spacer>