OP-39 Changed to one single wizard button on the welcome page. KISS :)

ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.ui

@@ -42,7 +42,7 @@ p, li { white-space: pre-wrap; }
      <x>50</x>
      <y>180</y>
      <width>501</width>
-     <height>61</height>
+     <height>71</height>
     </rect>
    </property>
    <property name="text">
@@ -50,7 +50,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#000000;&quot;&gt;The configuration created by the wizard contains settings that require a reboot of your controller. Please power cycle the controller before continuing.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#000000;&quot;&gt;The configuration created by the wizard contains settings that require a reboot of your controller. Please power cycle the controller before continuing. To power cycle the controller remove all batteries and the usb cable for at least 30 seconds.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

ground/openpilotgcs/src/plugins/welcome/qml/main.qml

@@ -47,12 +47,12 @@ Rectangle {
                 anchors.verticalCenterOffset: -2 //it looks better aligned to icons grid
 
                 //hide the logo on the very small screen to fit the buttons
-                visible: parent.availableWidth > width + parent.spacing + buttons.width
+                visible: parent.availableWidth > width + parent.spacing + buttons.width + wizard.width
             }
 
             Grid {
                 id: buttons
-                columns: 4
+                columns: 3
                 spacing: 4
                 anchors.verticalCenter: parent.verticalCenter
 
@@ -74,11 +74,6 @@ Rectangle {
                     onClicked: welcomePlugin.openPage("System")
                 }
 
-                WelcomePageButton {
-                    baseIconName: "bttn-vehwizard"
-                    onClicked: welcomePlugin.triggerAction("SetupWizardPlugin.ShowSetupWizard")
-                }
-
                WelcomePageButton {
                     baseIconName: "scopes"
                     label: "Scopes"
@@ -96,13 +91,15 @@ Rectangle {
                     label: "Firmware"
                     onClicked: welcomePlugin.openPage("Firmware")
                 }
-
-                WelcomePageButton {
-                    baseIconName: "bttn-txwizard"
-                    onClicked: welcomePlugin.triggerAction("ConfigPlugin.ShowInputWizard")
-        }
-
             } //icons grid
+
+            WelcomePageButton {
+                id: wizard
+                anchors.verticalCenter: parent.verticalCenter
+                baseIconName: "wizard"
+                onClicked: welcomePlugin.triggerAction("SetupWizardPlugin.ShowSetupWizard")
+            }
+
         } // images row
 
         CommunityPanel {

ground/openpilotgcs/src/plugins/welcome/welcome.qrc

@@ -30,5 +30,7 @@
         <file>qml/images/bttn-txwizard-off.png</file>
         <file>qml/images/bttn-vehwizard-on.png</file>
         <file>qml/images/bttn-vehwizard-off.png</file>
+        <file>qml/images/wizard-off.png</file>
+        <file>qml/images/wizard-on.png</file>
     </qresource>
 </RCC>