[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1692: Take hipplej's suggestion and tweak the two columns of three (in trunk: . src/gui)
Author: edmanm
Date: 2007-03-30 23:56:49 -0400 (Fri, 30 Mar 2007)
New Revision: 1692
Modified:
trunk/
trunk/src/gui/mainwindow.ui
Log:
r1767@adrastea: edmanm | 2007-03-30 23:51:30 -0400
Take hipplej's suggestion and tweak the two columns of three buttons each into
three columns of two buttons each at the bottom of the mainwindow dialog.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r1767] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/gui/mainwindow.ui
===================================================================
--- trunk/src/gui/mainwindow.ui 2007-03-30 01:54:30 UTC (rev 1691)
+++ trunk/src/gui/mainwindow.ui 2007-03-31 03:56:49 UTC (rev 1692)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>425</width>
- <height>395</height>
+ <width>445</width>
+ <height>375</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -19,14 +19,14 @@
</property>
<property name="minimumSize" >
<size>
- <width>425</width>
- <height>395</height>
+ <width>445</width>
+ <height>375</height>
</size>
</property>
<property name="maximumSize" >
<size>
- <width>425</width>
- <height>395</height>
+ <width>445</width>
+ <height>375</height>
</size>
</property>
<property name="windowTitle" >
@@ -99,14 +99,14 @@
<rect>
<x>20</x>
<y>10</y>
- <width>381</width>
- <height>245</height>
+ <width>400</width>
+ <height>225</height>
</rect>
</property>
<property name="minimumSize" >
<size>
- <width>381</width>
- <height>245</height>
+ <width>400</width>
+ <height>225</height>
</size>
</property>
<property name="title" >
@@ -117,8 +117,8 @@
<rect>
<x>19</x>
<y>29</y>
- <width>351</width>
- <height>250</height>
+ <width>371</width>
+ <height>215</height>
</rect>
</property>
<layout class="QGridLayout" >
@@ -128,33 +128,33 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="0" column="1" >
- <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
+ <item row="0" column="0" colspan="2" >
+ <widget class="VClickLabel" native="1" name="lblStartStopTor" >
<property name="text" >
- <string>Setup Relaying</string>
+ <string>Start Tor</string>
</property>
<property name="statusTip" >
- <string>Set up a Tor relay and help the network grow</string>
+ <string>Start Tor</string>
</property>
<property name="pixmap" >
- <pixmap>:/images/48x48/network-server.png</pixmap>
+ <pixmap>:/images/48x48/start-tor.png</pixmap>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="VClickLabel" native="1" name="lblStartStopTor" >
+ <item row="0" column="2" colspan="2" >
+ <widget class="VClickLabel" native="1" name="lblSetupRelaying" >
<property name="text" >
- <string>Start Tor</string>
+ <string>Setup Relaying</string>
</property>
<property name="statusTip" >
- <string>Start Tor</string>
+ <string>Set up a Tor relay and help the network grow</string>
</property>
<property name="pixmap" >
- <pixmap>:/images/48x48/start-tor.png</pixmap>
+ <pixmap>:/images/48x48/network-server.png</pixmap>
</property>
</widget>
</item>
- <item row="1" column="0" >
+ <item row="1" column="0" colspan="2" >
<widget class="VClickLabel" native="1" name="lblViewNetwork" >
<property name="text" >
<string>View the Network</string>
@@ -167,7 +167,7 @@
</property>
</widget>
</item>
- <item row="1" column="1" >
+ <item row="1" column="2" colspan="2" >
<widget class="VClickLabel" native="1" name="lblNewIdentity" >
<property name="text" >
<string>Use a New Identity</string>
@@ -180,134 +180,201 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
+ <item row="2" column="0" colspan="4" >
<widget class="Line" name="line" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QWidget" name="leftVerticalLayout" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
+ <item row="3" column="0" colspan="4" >
+ <widget class="QWidget" name="lowerLayout" >
+ <layout class="QHBoxLayout">
<item>
- <widget class="VClickLabel" name="lblBandwidthGraph" >
- <property name="text" >
- <string>Bandwidth Graph</string>
- </property>
- <property name="statusTip" >
- <string>View Tor's bandwidth usage</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/16x16/utilities-system-monitor.png</pixmap>
- </property>
+ <widget class="QWidget" name="leftVerticalLayout" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="VClickLabel" name="lblBandwidthGraph" >
+ <property name="text" >
+ <string>Bandwidth Graph</string>
+ </property>
+ <property name="statusTip" >
+ <string>View Tor's bandwidth usage</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/16x16/utilities-system-monitor.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="VClickLabel" name="lblMessageLog" >
+ <property name="text" >
+ <string>Message Log</string>
+ </property>
+ <property name="statusTip" >
+ <string>View Tor's log message history</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/16x16/format-justify-fill.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="VClickLabel" name="lblMessageLog" >
- <property name="text" >
- <string>Message Log</string>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="statusTip" >
- <string>View Tor's log message history</string>
+ <property name="sizeHint" >
+ <size>
+ <width>18</width>
+ </size>
</property>
- <property name="pixmap" >
- <pixmap>:/images/16x16/format-justify-fill.png</pixmap>
- </property>
- </widget>
+ </spacer>
</item>
<item>
- <widget class="VClickLabel" name="lblSettings" >
- <property name="text" >
- <string>Settings</string>
- </property>
- <property name="statusTip" >
- <string>Configure Tor and Vidalia</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/16x16/preferences-system.png</pixmap>
- </property>
+ <widget class="QWidget" name="midVerticalLayout" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="VClickLabel" name="lblHelpBrowser" >
+ <property name="text" >
+ <string>Help</string>
+ </property>
+ <property name="statusTip" >
+ <string>View help documentation</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/16x16/help-browser.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="VClickLabel" name="lblSettings" >
+ <property name="text" >
+ <string>Settings</string>
+ </property>
+ <property name="statusTip" >
+ <string>Configure Tor and Vidalia</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/16x16/preferences-system.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
- <width>20</width>
- <height>40</height>
+ <width>18</width>
</size>
</property>
</spacer>
</item>
- </layout>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="QWidget" name="rightVerticalLayout" >
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
- <widget class="VClickLabel" name="lblHelpBrowser" >
- <property name="text" >
- <string>Help</string>
- </property>
- <property name="statusTip" >
- <string>View help documentation</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/16x16/help-browser.png</pixmap>
- </property>
+ <widget class="QWidget" name="rightVerticalLayout" >
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="VClickLabel" name="lblAboutVidalia" >
+ <property name="text" >
+ <string>About</string>
+ </property>
+ <property name="statusTip" >
+ <string>View version and license information</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/16x16/tor-logo.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="VClickLabel" name="lblExit" >
+ <property name="text" >
+ <string>Exit</string>
+ </property>
+ <property name="statusTip" >
+ <string>Exit Vidalia</string>
+ </property>
+ <property name="pixmap" >
+ <pixmap>:/images/16x16/emblem-unreadable.png</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</widget>
</item>
<item>
- <widget class="VClickLabel" name="lblAboutVidalia" >
- <property name="text" >
- <string>About</string>
- </property>
- <property name="statusTip" >
- <string>View version and license information</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/16x16/tor-logo.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
- <widget class="VClickLabel" name="lblExit" >
- <property name="text" >
- <string>Exit</string>
- </property>
- <property name="statusTip" >
- <string>Exit Vidalia</string>
- </property>
- <property name="pixmap" >
- <pixmap>:/images/16x16/emblem-unreadable.png</pixmap>
- </property>
- </widget>
- </item>
- <item>
<spacer>
<property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
- <width>20</width>
- <height>40</height>
+ <width>18</width>
</size>
</property>
</spacer>
@@ -322,40 +389,40 @@
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
- <number>0</number>
- </property>
+ <number>0</number>
+ </property>
<property name="spacing" >
- <number>6</number>
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QCheckBox" name="chkShowOnStartup" >
+ <property name="text" >
+ <string>Show this window on startup</string>
</property>
- <item>
- <widget class="QCheckBox" name="chkShowOnStartup" >
- <property name="text" >
- <string>Show this window on startup</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>18</width>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="btnHide" >
- <property name="text" >
- <string>Hide</string>
- </property>
- <property name="statusTip" >
- <string>Hide this window</string>
- </property>
- </widget>
- </item>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>18</width>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnHide" >
+ <property name="text" >
+ <string>Hide</string>
+ </property>
+ <property name="statusTip" >
+ <string>Hide this window</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
@@ -366,7 +433,7 @@
<property name="sizeHint" >
<size>
<width>20</width>
- <height>20</height>
+ <height>0</height>
</size>
</property>
</spacer>