[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1652: Rearrange the custom bandwidth limit boxes a bit and add a c (in trunk: . src/gui/config)
Author: edmanm
Date: 2007-02-24 20:15:03 -0500 (Sat, 24 Feb 2007)
New Revision: 1652
Modified:
trunk/
trunk/src/gui/config/serverpage.ui
Log:
r1700@adrastea: edmanm | 2007-02-24 20:11:14 -0500
Rearrange the custom bandwidth limit boxes a bit and add a couple sentences
to give users a hint as to what the constraints are, instead of simply
enforcing the limits and hoping they notice. They don't.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r1700] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/gui/config/serverpage.ui
===================================================================
--- trunk/src/gui/config/serverpage.ui 2007-02-24 20:42:12 UTC (rev 1651)
+++ trunk/src/gui/config/serverpage.ui 2007-02-25 01:15:03 UTC (rev 1652)
@@ -1035,138 +1035,198 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="1" column="0" >
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
+ <item row="4" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
</property>
- <property name="spacing" >
- <number>6</number>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
</property>
- <item row="1" column="0" >
- <widget class="QLineEdit" name="lineAvgRateLimit" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>50</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize" >
- <size>
- <width>50</width>
- <height>27</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Long-term average bandwidth limit</string>
- </property>
- <property name="maxLength" >
- <number>10</number>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight</set>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="label_10" >
- <property name="text" >
- <string>Average Rate</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="label_17" >
- <property name="text" >
- <string>KB/s</string>
- </property>
- </widget>
- </item>
- </layout>
+ </spacer>
</item>
- <item row="0" column="0" >
- <layout class="QGridLayout" >
+ <item row="1" column="0" >
+ <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
- <item row="1" column="0" >
- <widget class="QLineEdit" name="lineMaxRateLimit" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- <property name="minimumSize" >
- <size>
- <width>50</width>
- <height>0</height>
- </size>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <property name="maximumSize" >
- <size>
- <width>50</width>
- <height>27</height>
- </size>
- </property>
- <property name="contextMenuPolicy" >
- <enum>Qt::NoContextMenu</enum>
- </property>
- <property name="toolTip" >
- <string>Peak bandwidth rate limit</string>
- </property>
- <property name="maxLength" >
- <number>10</number>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight</set>
- </property>
- </widget>
+ <item>
+ <widget class="QLabel" name="label_2" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Average Rate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineAvgRateLimit" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>60</width>
+ <height>22</height>
+ </size>
+ </property>
+ <property name="toolTip" >
+ <string>Long-term average bandwidth rate</string>
+ </property>
+ <property name="maxLength" >
+ <number>12</number>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_6" >
+ <property name="text" >
+ <string>KB/s</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
- <item row="1" column="1" >
- <widget class="QLabel" name="label_15" >
- <property name="text" >
- <string>KB/s</string>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- </widget>
- </item>
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="label_14" >
- <property name="text" >
- <string>Maximum Rate</string>
+ <property name="spacing" >
+ <number>6</number>
</property>
- </widget>
+ <item>
+ <widget class="QLabel" name="label_5" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>100</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="text" >
+ <string>Maximum Rate</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="lineMaxRateLimit" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>60</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="toolTip" >
+ <string>Peak bandwidth rate limit</string>
+ </property>
+ <property name="maxLength" >
+ <number>12</number>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignRight</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_7" >
+ <property name="text" >
+ <string>KB/s</string>
+ </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>71</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
</item>
</layout>
</item>
- <item row="2" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_8" >
+ <property name="text" >
+ <string>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</string>
</property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
+ <property name="wordWrap" >
+ <bool>true</bool>
</property>
- </spacer>
+ </widget>
</item>
</layout>
</widget>