commit d5ed906d3665c44fd6097026bee3309f2f13773b Author: Tomas Touceda chiiph@torproject.org Date: Sat Jun 11 03:16:45 2011 -0300
Fix layouts for mac --- src/vidalia/config/AdvancedPage.ui | 72 ++++++++---------------------------- src/vidalia/config/ServerPage.ui | 72 ++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 92 deletions(-)
diff --git a/src/vidalia/config/AdvancedPage.ui b/src/vidalia/config/AdvancedPage.ui index 2d06162..add13c0 100644 --- a/src/vidalia/config/AdvancedPage.ui +++ b/src/vidalia/config/AdvancedPage.ui @@ -14,12 +14,6 @@ <enum>Qt::NoContextMenu</enum> </property> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <widget class="QGroupBox" name="grpControlPort"> <property name="contextMenuPolicy"> @@ -29,21 +23,15 @@ <string>Tor Control</string> </property> <layout class="QVBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <layout class="QGridLayout"> - <property name="margin"> - <number>0</number> - </property> - <property name="spacing"> + <property name="horizontalSpacing"> <number>2</number> </property> - <item row="5" column="0"> + <property name="verticalSpacing"> + <number>6</number> + </property> + <item row="4" column="0"> <widget class="QLabel" name="lblAuth"> <property name="text"> <string>Authentication:</string> @@ -53,7 +41,7 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="lblAddress"> <property name="text"> <string>Address:</string> @@ -63,14 +51,11 @@ </property> </widget> </item> - <item row="5" column="2" colspan="3"> + <item row="4" column="2" colspan="3"> <layout class="QHBoxLayout"> <property name="spacing"> <number>2</number> </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QComboBox" name="cmbAuthMethod"> <property name="minimumSize"> @@ -118,7 +103,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint"> + <property name="sizeHint" stdset="0"> <size> <width>0</width> <height>20</height> @@ -128,14 +113,8 @@ </item> </layout> </item> - <item row="2" column="2"> + <item row="1" column="2"> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> <item> <widget class="QLineEdit" name="lineControlAddress"> <property name="maximumSize"> @@ -186,7 +165,7 @@ <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint"> + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -196,16 +175,6 @@ </item> </layout> </item> - <item row="2" column="3"> - <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> - </layout> - </item> <item row="0" column="2"> <widget class="QRadioButton" name="rdoControlPort"> <property name="text"> @@ -216,7 +185,7 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="lblPath"> <property name="enabled"> <bool>false</bool> @@ -229,21 +198,21 @@ </property> </widget> </item> - <item row="4" column="1" colspan="2"> + <item row="3" column="1" colspan="2"> <widget class="QLineEdit" name="lineSocketPath"> <property name="enabled"> <bool>false</bool> </property> </widget> </item> - <item row="3" column="2"> + <item row="2" column="2"> <widget class="QRadioButton" name="rdoControlSocket"> <property name="text"> <string>Use Unix domain socket (ControlSocket)</string> </property> </widget> </item> - <item row="4" column="3"> + <item row="3" column="3"> <widget class="QPushButton" name="btnBrowseSocketPath"> <property name="enabled"> <bool>false</bool> @@ -267,9 +236,6 @@ <string>Tor Configuration File</string> </property> <layout class="QGridLayout" name="gridLayout_3"> - <property name="margin"> - <number>9</number> - </property> <item row="0" column="1"> <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="0" colspan="2"> @@ -338,7 +304,7 @@ <property name="sizeType"> <enum>QSizePolicy::MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="sizeHint" stdset="0"> <size> <width>100</width> <height>20</height> @@ -360,12 +326,6 @@ <string>Data Directory</string> </property> <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>9</number> - </property> <item> <widget class="QLineEdit" name="lineTorDataDirectory"> <property name="enabled"> @@ -412,7 +372,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint"> + <property name="sizeHint" stdset="0"> <size> <width>489</width> <height>141</height> diff --git a/src/vidalia/config/ServerPage.ui b/src/vidalia/config/ServerPage.ui index 6584058..a642471 100644 --- a/src/vidalia/config/ServerPage.ui +++ b/src/vidalia/config/ServerPage.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>546</width> - <height>463</height> + <width>548</width> + <height>507</height> </rect> </property> <property name="contextMenuPolicy"> @@ -15,44 +15,44 @@ </property> <layout class="QVBoxLayout"> <item> - <widget class="QRadioButton" name="rdoClientMode"> - <property name="text"> - <string>Run as a client only</string> - </property> - </widget> - </item> - <item> - <widget class="QRadioButton" name="rdoServerMode"> - <property name="text"> - <string>Relay traffic for the Tor network</string> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0" colspan="3"> + <widget class="QRadioButton" name="rdoClientMode"> + <property name="text"> + <string>Run as a client only</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="3"> + <widget class="QRadioButton" name="rdoServerMode"> + <property name="text"> + <string>Relay traffic for the Tor network</string> + </property> + </widget> + </item> + <item row="2" column="0"> <widget class="QRadioButton" name="rdoBridgeMode"> <property name="text"> <string>Help censored users reach the Tor network</string> </property> </widget> </item> - <item> + <item row="2" column="1"> <widget class="QLabel" name="lblWhatsThis"> <property name="text"> <string><a href="#bridgeHelp">What's this?</a></string> </property> </widget> </item> - <item> + <item row="2" column="2" colspan="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> - <height>20</height> + <height>0</height> </size> </property> </spacer> @@ -127,7 +127,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -287,7 +287,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>321</width> <height>20</height> @@ -300,7 +300,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -313,7 +313,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>41</width> <height>20</height> @@ -501,7 +501,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -528,7 +528,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -654,7 +654,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>71</width> <height>20</height> @@ -686,7 +686,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -828,7 +828,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>42</height> @@ -843,7 +843,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -900,7 +900,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>40</height> @@ -991,7 +991,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>40</width> <height>20</height> @@ -1016,7 +1016,7 @@ problem with your relay. You might also include your PGP or GPG fingerprint.</st <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>420</width> <height>16</height>
tor-commits@lists.torproject.org
-
chiiph＠torproject.org