From fc2d0134024619c84eda5649df2196e5600c3808 Mon Sep 17 00:00:00 2001
From: Edgars Cirulis <edgarsciruliss@gmail.com>
Date: Sat, 20 Jul 2024 01:50:30 +0300
Subject: [PATCH] ui: swap timeoutSecondsLabel and numberOfManualRetriesLabel
 order

fixes: 7a200a337f08cfa1e32102594958f10cb7f000c6
conflicted with 6078a771c18fd749f38d7c1a2f80ed3c7ec7ad28

Signed-off-by: Edgars Cirulis <edgarsciruliss@gmail.com>
---
 launcher/ui/pages/global/LauncherPage.ui | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index b3387ba02..72039488b 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -291,6 +291,20 @@
            </widget>
           </item>
           <item row="2" column="0">
+           <widget class="QLabel" name="numberOfManualRetriesLabel">
+            <property name="text">
+             <string>Number of manual retries</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QSpinBox" name="numberOfManualRetriesSpinBox">
+            <property name="minimum">
+             <number>0</number>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
            <widget class="QLabel" name="timeoutSecondsLabel">
             <property name="toolTip">
              <string>Seconds to wait until the requests are terminated</string>
@@ -300,27 +314,13 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="3" column="1">
            <widget class="QSpinBox" name="timeoutSecondsSpinBox">
             <property name="suffix">
              <string>s</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="numberOfManualRetriesLabel">
-            <property name="text">
-             <string>Number of manual retries</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="QSpinBox" name="numberOfManualRetriesSpinBox">
-            <property name="minimum">
-             <number>0</number>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>