From 1e1db31ab5851d25c8dde2a2a8589803dfbb477a Mon Sep 17 00:00:00 2001
From: thalieht <yjapysgr@sharklasers.com>
Date: Sat, 24 Feb 2018 16:20:59 +0200
Subject: [PATCH 1/3] Use unique layout names

---
 src/gui/optionsdlg.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/optionsdlg.ui b/src/gui/optionsdlg.ui
index 69efcdb6a..85471fe47 100644
--- a/src/gui/optionsdlg.ui
+++ b/src/gui/optionsdlg.ui
@@ -2372,7 +2372,7 @@
                  <property name="checked">
                   <bool>false</bool>
                  </property>
-                 <layout class="QGridLayout" name="gridLayout_8">
+                 <layout class="QGridLayout" name="gridLayout_13">
                   <item row="2" column="3">
                    <spacer name="horizontalSpacer_21">
                     <property name="orientation">

From 0b185e347b699f69569a034682f4553191572f8b Mon Sep 17 00:00:00 2001
From: thalieht <yjapysgr@sharklasers.com>
Date: Sat, 24 Feb 2018 18:27:07 +0200
Subject: [PATCH 2/3] Use spinbox suffix to display rate unit

---
 src/gui/optionsdlg.ui | 50 +++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/src/gui/optionsdlg.ui b/src/gui/optionsdlg.ui
index 85471fe47..de3880bca 100644
--- a/src/gui/optionsdlg.ui
+++ b/src/gui/optionsdlg.ui
@@ -1774,6 +1774,9 @@
                  <property name="enabled">
                   <bool>false</bool>
                  </property>
+                 <property name="suffix">
+                  <string> KiB/s</string>
+                 </property>
                  <property name="minimum">
                   <number>1</number>
                  </property>
@@ -1792,18 +1795,14 @@
                  </property>
                 </widget>
                </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">
                 <widget class="QSpinBox" name="spinDownloadLimit">
                  <property name="enabled">
                   <bool>false</bool>
                  </property>
+                 <property name="suffix">
+                  <string> KiB/s</string>
+                 </property>
                  <property name="minimum">
                   <number>1</number>
                  </property>
@@ -1815,13 +1814,6 @@
                  </property>
                 </widget>
                </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">
                 <widget class="QLabel" name="labelGlobalRate"/>
                </item>
@@ -1832,7 +1824,7 @@
                  </property>
                 </widget>
                </item>
-               <item row="0" column="4">
+               <item row="0" column="3">
                 <spacer name="horizontalSpacer">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
@@ -1854,7 +1846,10 @@
                <string>Alternative Rate Limits</string>
               </property>
               <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">
                  <property name="title">
                   <string>Schedule &amp;the use of alternative rate limits</string>
@@ -1965,9 +1960,6 @@
                  </layout>
                 </widget>
                </item>
-               <item row="0" column="0" rowspan="2">
-                <widget class="QLabel" name="labelAltRate"/>
-               </item>
                <item row="0" column="1">
                 <widget class="QCheckBox" name="checkUploadLimitAlt">
                  <property name="text">
@@ -1987,6 +1979,9 @@
                  <property name="enabled">
                   <bool>false</bool>
                  </property>
+                 <property name="suffix">
+                  <string> KiB/s</string>
+                 </property>
                  <property name="minimum">
                   <number>1</number>
                  </property>
@@ -2003,6 +1998,9 @@
                  <property name="enabled">
                   <bool>false</bool>
                  </property>
+                 <property name="suffix">
+                  <string> KiB/s</string>
+                 </property>
                  <property name="minimum">
                   <number>1</number>
                  </property>
@@ -2015,20 +2013,6 @@
                 </widget>
                </item>
                <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">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>

From 2eea57e609431cbfe6d3e8871a5762cdd0110ff6 Mon Sep 17 00:00:00 2001
From: thalieht <yjapysgr@sharklasers.com>
Date: Sat, 24 Feb 2018 23:18:31 +0200
Subject: [PATCH 3/3] Use spinbox suffix to display time unit

---
 src/gui/optionsdlg.ui | 60 +++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/gui/optionsdlg.ui b/src/gui/optionsdlg.ui
index de3880bca..9258b9069 100644
--- a/src/gui/optionsdlg.ui
+++ b/src/gui/optionsdlg.ui
@@ -2357,7 +2357,7 @@
                   <bool>false</bool>
                  </property>
                  <layout class="QGridLayout" name="gridLayout_13">
-                  <item row="2" column="3">
+                  <item row="2" column="2">
                    <spacer name="horizontalSpacer_21">
                     <property name="orientation">
                      <enum>Qt::Horizontal</enum>
@@ -2410,7 +2410,7 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="0" column="3">
+                  <item row="0" column="2">
                    <spacer name="horizontalSpacer_9">
                     <property name="orientation">
                      <enum>Qt::Horizontal</enum>
@@ -2423,7 +2423,7 @@
                     </property>
                    </spacer>
                   </item>
-                  <item row="1" column="3">
+                  <item row="1" column="2">
                    <spacer name="horizontalSpacer_15">
                     <property name="orientation">
                      <enum>Qt::Horizontal</enum>
@@ -2438,6 +2438,9 @@
                   </item>
                   <item row="2" column="1">
                    <widget class="QSpinBox" name="spinSlowTorrentsInactivityTimer">
+                    <property name="suffix">
+                     <string extracomment="seconds"> sec</string>
+                    </property>
                     <property name="minimum">
                      <number>1</number>
                     </property>
@@ -2456,13 +2459,6 @@
                     </property>
                    </widget>
                   </item>
-                  <item row="2" column="2">
-                   <widget class="QLabel" name="labelSeconds">
-                    <property name="text">
-                     <string>seconds</string>
-                    </property>
-                   </widget>
-                  </item>
                  </layout>
                 </widget>
                </item>
@@ -2505,23 +2501,6 @@
                  </property>
                 </widget>
                </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">
                 <spacer name="horizontalSpacer_20">
                  <property name="orientation">
@@ -2569,6 +2548,9 @@
                  <property name="alignment">
                   <set>Qt::AlignCenter</set>
                  </property>
+                 <property name="suffix">
+                  <string extracomment="minutes"> min</string>
+                 </property>
                  <property name="maximum">
                   <number>9999999</number>
                  </property>
@@ -2599,13 +2581,6 @@
                  </property>
                 </widget>
                </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">
                 <widget class="QCheckBox" name="checkMaxSeedingMinutes">
                  <property name="text">
@@ -2613,6 +2588,23 @@
                  </property>
                 </widget>
                </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>
              </widget>
             </item>