[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1860: Rework the spacing on the advanced page (again) to (hopefull (in trunk: . src/gui/config)
Author: edmanm
Date: 2007-08-23 02:21:21 -0400 (Thu, 23 Aug 2007)
New Revision: 1860
Modified:
trunk/
trunk/src/gui/config/advancedpage.ui
Log:
r2042@adrastea: edmanm | 2007-08-23 02:19:27 -0400
Rework the spacing on the advanced page (again) to (hopefully) give the
control address and port enough room on all platforms.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r2042] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/gui/config/advancedpage.ui
===================================================================
--- trunk/src/gui/config/advancedpage.ui 2007-08-23 03:43:43 UTC (rev 1859)
+++ trunk/src/gui/config/advancedpage.ui 2007-08-23 06:21:21 UTC (rev 1860)
@@ -516,16 +516,6 @@
<property name="spacing" >
<number>2</number>
</property>
- <item row="0" column="2" >
- <widget class="QLabel" name="label_7" >
- <property name="text" >
- <string>:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
<item row="1" column="0" >
<widget class="QLabel" name="label_6" >
<property name="text" >
@@ -536,22 +526,6 @@
</property>
</widget>
</item>
- <item row="0" column="3" >
- <widget class="QLineEdit" name="lineControlPort" >
- <property name="maximumSize" >
- <size>
- <width>55</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="toolTip" >
- <string>Port that Vidalia uses to communicate with Tor.</string>
- </property>
- <property name="maxLength" >
- <number>5</number>
- </property>
- </widget>
- </item>
<item row="0" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
@@ -562,38 +536,28 @@
</property>
</widget>
</item>
- <item row="0" column="4" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="1" column="1" colspan="3" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
- <number>6</number>
+ <number>2</number>
</property>
<item>
<widget class="QComboBox" name="cmbAuthMethod" >
- <property name="toolTip" >
- <string>Authentication method to use when connecting to Tor's control port</string>
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
</property>
<property name="sizeAdjustPolicy" >
<enum>QComboBox::AdjustToContents</enum>
</property>
<item>
<property name="text" >
- <string>None</string>
+ <string>Null</string>
</property>
</item>
<item>
@@ -608,6 +572,29 @@
</item>
</widget>
</item>
+ <item>
+ <widget class="QLineEdit" name="linePassword" />
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkRandomPassword" >
+ <property name="text" >
+ <string>Randomly Generate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
<item row="0" column="1" >
@@ -622,49 +609,72 @@
<widget class="QLineEdit" name="lineControlAddress" >
<property name="maximumSize" >
<size>
- <width>85</width>
+ <width>120</width>
<height>16777215</height>
</size>
</property>
- <property name="toolTip" >
- <string>IP address on which Tor is listening for controller connections.</string>
- </property>
<property name="maxLength" >
- <number>15</number>
+ <number>16</number>
</property>
<property name="alignment" >
<set>Qt::AlignRight</set>
</property>
</widget>
</item>
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineControlPort" >
+ <property name="minimumSize" >
+ <size>
+ <width>75</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>75</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="maxLength" >
+ <number>5</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</item>
- <item row="1" column="4" >
- <widget class="QLineEdit" name="linePassword" >
- <property name="toolTip" >
- <string>Password to use when authenticating to Tor</string>
+ <item row="0" column="2" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
+ </layout>
</item>
- <item row="1" column="5" >
- <widget class="QCheckBox" name="chkRandomPassword" >
- <property name="toolTip" >
- <string>Check this box to use a random password each time Tor is started</string>
- </property>
- <property name="text" >
- <string>Randomly Generate</string>
- </property>
- <property name="enabled" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>