Merge pull request #8488 from thalieht/fix

Move suffix-labels inside the corresponding spinboxes
This commit is contained in:
Vladimir Golovnev 2018-03-12 16:58:05 +03:00 committed by GitHub
commit 3348eef423
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1788,6 +1788,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="suffix">
<string> KiB/s</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -1806,18 +1809,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3">
<widget class="QLabel" name="label_10">
<property name="text">
<string>KiB/s</string>
</property>
</widget>
</item>
<item row="1" column="2"> <item row="1" column="2">
<widget class="QSpinBox" name="spinDownloadLimit"> <widget class="QSpinBox" name="spinDownloadLimit">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="suffix">
<string> KiB/s</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -1829,13 +1828,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3">
<widget class="QLabel" name="label_13">
<property name="text">
<string>KiB/s</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2"> <item row="0" column="0" rowspan="2">
<widget class="QLabel" name="labelGlobalRate"/> <widget class="QLabel" name="labelGlobalRate"/>
</item> </item>
@ -1846,7 +1838,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="3">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -1868,7 +1860,10 @@
<string>Alternative Rate Limits</string> <string>Alternative Rate Limits</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QGridLayout" name="gridLayout_6">
<item row="2" column="0" colspan="5"> <item row="0" column="0" rowspan="2">
<widget class="QLabel" name="labelAltRate"/>
</item>
<item row="2" column="0" colspan="4">
<widget class="QGroupBox" name="check_schedule"> <widget class="QGroupBox" name="check_schedule">
<property name="title"> <property name="title">
<string>Schedule &amp;the use of alternative rate limits</string> <string>Schedule &amp;the use of alternative rate limits</string>
@ -1979,9 +1974,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="labelAltRate"/>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="checkUploadLimitAlt"> <widget class="QCheckBox" name="checkUploadLimitAlt">
<property name="text"> <property name="text">
@ -2001,6 +1993,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="suffix">
<string> KiB/s</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -2017,6 +2012,9 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="suffix">
<string> KiB/s</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -2029,20 +2027,6 @@
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QLabel" name="label_14">
<property name="text">
<string>KiB/s</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_15">
<property name="text">
<string>KiB/s</string>
</property>
</widget>
</item>
<item row="0" column="4">
<spacer name="horizontalSpacer_5"> <spacer name="horizontalSpacer_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -2386,8 +2370,8 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_8"> <layout class="QGridLayout" name="gridLayout_13">
<item row="2" column="3"> <item row="2" column="2">
<spacer name="horizontalSpacer_21"> <spacer name="horizontalSpacer_21">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -2440,7 +2424,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="0" column="2">
<spacer name="horizontalSpacer_9"> <spacer name="horizontalSpacer_9">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -2453,7 +2437,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="3"> <item row="1" column="2">
<spacer name="horizontalSpacer_15"> <spacer name="horizontalSpacer_15">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -2468,6 +2452,9 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="spinSlowTorrentsInactivityTimer"> <widget class="QSpinBox" name="spinSlowTorrentsInactivityTimer">
<property name="suffix">
<string extracomment="seconds"> sec</string>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -2486,13 +2473,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2">
<widget class="QLabel" name="labelSeconds">
<property name="text">
<string>seconds</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -2535,23 +2515,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="4" colspan="2">
<widget class="QComboBox" name="comboRatioLimitAct">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>Pause them</string>
</property>
</item>
<item>
<property name="text">
<string>Remove them</string>
</property>
</item>
</widget>
</item>
<item row="4" column="6"> <item row="4" column="6">
<spacer name="horizontalSpacer_20"> <spacer name="horizontalSpacer_20">
<property name="orientation"> <property name="orientation">
@ -2599,6 +2562,9 @@
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="suffix">
<string extracomment="minutes"> min</string>
</property>
<property name="maximum"> <property name="maximum">
<number>9999999</number> <number>9999999</number>
</property> </property>
@ -2629,13 +2595,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="5">
<widget class="QLabel" name="label_11">
<property name="text">
<string>minutes</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4"> <item row="3" column="0" colspan="4">
<widget class="QCheckBox" name="checkMaxSeedingMinutes"> <widget class="QCheckBox" name="checkMaxSeedingMinutes">
<property name="text"> <property name="text">
@ -2643,6 +2602,23 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="4">
<widget class="QComboBox" name="comboRatioLimitAct">
<property name="enabled">
<bool>false</bool>
</property>
<item>
<property name="text">
<string>Pause them</string>
</property>
</item>
<item>
<property name="text">
<string>Remove them</string>
</property>
</item>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>