From 066af2d9b80ed702dc390d8b609fe93e56f884ae Mon Sep 17 00:00:00 2001
From: Phil Taylor <phil@m0vse.uk>
Date: Tue, 11 Oct 2022 23:56:00 +0100
Subject: [PATCH] Move Setup button to experimental and fix storing buttons

---
 wfmain.cpp |  3 ++-
 wfmain.ui  | 33 +++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/wfmain.cpp b/wfmain.cpp
index 546fdcc..6cea0f7 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -2179,7 +2179,8 @@ void wfmain::loadSettings()
         settings->endArray();
     }
 
-            
+    settings->endGroup();
+
 }
 
 void wfmain::serverAddUserLine(const QString& user, const QString& pass, const int& type)
diff --git a/wfmain.ui b/wfmain.ui
index a1b1c16..23ab233 100644
--- a/wfmain.ui
+++ b/wfmain.ui
@@ -2223,7 +2223,7 @@
           <item>
            <widget class="QStackedWidget" name="settingsStack">
             <property name="currentIndex">
-             <number>4</number>
+             <number>6</number>
             </property>
             <widget class="QWidget" name="radioAccess">
              <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -4870,13 +4870,6 @@
                 </item>
                </layout>
               </item>
-              <item>
-               <widget class="QPushButton" name="usbControllerBtn">
-                <property name="text">
-                 <string>Setup USB Controller</string>
-                </property>
-               </widget>
-              </item>
               <item>
                <spacer name="verticalSpacer_4">
                 <property name="orientation">
@@ -5146,6 +5139,30 @@
                 </item>
                </layout>
               </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_45">
+                <item>
+                 <widget class="QPushButton" name="usbControllerBtn">
+                  <property name="text">
+                   <string>Setup USB Controller</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <spacer name="horizontalSpacer_36">
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                  <property name="sizeHint" stdset="0">
+                   <size>
+                    <width>40</width>
+                    <height>20</height>
+                   </size>
+                  </property>
+                 </spacer>
+                </item>
+               </layout>
+              </item>
               <item>
                <spacer name="verticalSpacer_6">
                 <property name="orientation">