Added button imgaes for the wizard and created a resource file to host them.

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

@@ -31,9 +31,8 @@ p, li { white-space: pre-wrap; }
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The wizard is now ready to write the configuration directly to your OpenPilot controller. This is only possible if the controller is connected and identified in the first step of this wizard. If the controller is not connected, or if the controller type was selected manually you can instead of writing the configuration to the controller save it to disk for later use.</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">If any of the selections made in this wizard requires a reboot of the controller then that will be performed in this step.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">If any of the selections made in this wizard requires a reboot of the controller then that will have to be performed after this step by power cycling the OpenPilot controller board.</span></p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-&lt;p 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;&quot;&gt;If you by any reason do not want to write the configuration directly to the controller you can choose to save the configuration to disk and then exit this wizard.&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/setupwizard/pages/inputpage.ui

@@ -31,7 +31,7 @@ p, li { white-space: pre-wrap; }
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:12pt; font-weight:600;"></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">The OpenPilot controller supports many different types of input signals. Please select the type of input that matches your Receiver configuration. If you are unsure leave the default option selected and continue the wizard.</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p>
-&lt;p 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;&quot;&gt;Some input options require the OpenPilot controller to be rebooted before the changes can take place. If an option that requires a reboot is selected the controller will be rebooted at the end of this wizard after the configuration is written to the controller.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p 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;&quot;&gt;Some input options require the OpenPilot controller to be rebooted before the changes can take place. If an option that requires a reboot is selected the controller will need to be rebooted at the end of this wizard after the configuration is written to the controller.&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/setupwizard/pages/vehiclepage.ui

@@ -61,21 +61,40 @@ p, li { white-space: pre-wrap; }
    <property name="alignment">
     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
    </property>
-   <widget class="QPushButton" name="multirotorButton">
+   <widget class="QToolButton" name="multirotorButton">
     <property name="geometry">
      <rect>
       <x>50</x>
       <y>40</y>
       <width>100</width>
-      <height>100</height>
+      <height>120</height>
      </rect>
     </property>
     <property name="toolTip">
      <string>Tricopter, Quadcopter, Hexacopter, Octocopter</string>
     </property>
+    <property name="autoFillBackground">
+     <bool>false</bool>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">QToolButton { border: none }</string>
+    </property>
     <property name="text">
      <string>Multirotor</string>
     </property>
+    <property name="icon">
+     <iconset resource="../wizardResources.qrc">
+      <normaloff>:/setupwizard/resources/bttn-multi-up.png</normaloff>
+      <normalon>:/setupwizard/resources/bttn-multi-down.png</normalon>
+      <activeoff>:/setupwizard/resources/bttn-multi-down.png</activeoff>
+      <activeon>:/setupwizard/resources/bttn-multi-down.png</activeon>:/setupwizard/resources/bttn-multi-up.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>100</width>
+      <height>100</height>
+     </size>
+    </property>
     <property name="checkable">
      <bool>true</bool>
     </property>
@@ -85,84 +104,149 @@ p, li { white-space: pre-wrap; }
     <property name="autoExclusive">
      <bool>true</bool>
     </property>
-    <property name="flat">
+    <property name="toolButtonStyle">
-     <bool>false</bool>
+     <enum>Qt::ToolButtonTextUnderIcon</enum>
+    </property>
+    <property name="autoRaise">
+     <bool>true</bool>
     </property>
    </widget>
-   <widget class="QPushButton" name="fixedwingButton">
+   <widget class="QToolButton" name="fixedwingButton">
     <property name="geometry">
      <rect>
       <x>170</x>
       <y>40</y>
       <width>100</width>
-      <height>100</height>
+      <height>120</height>
      </rect>
     </property>
     <property name="toolTip">
      <string>Airplane, Sloper, Jet</string>
     </property>
+    <property name="styleSheet">
+     <string notr="true">QToolButton { border: none }</string>
+    </property>
     <property name="text">
      <string>Fixed wing</string>
     </property>
+    <property name="icon">
+     <iconset resource="../wizardResources.qrc">
+      <normaloff>:/setupwizard/resources/bttn-plane-up.png</normaloff>
+      <normalon>:/setupwizard/resources/bttn-plane-down.png</normalon>
+      <activeoff>:/setupwizard/resources/bttn-plane-down.png</activeoff>
+      <activeon>:/setupwizard/resources/bttn-plane-down.png</activeon>:/setupwizard/resources/bttn-plane-up.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>100</width>
+      <height>100</height>
+     </size>
+    </property>
     <property name="checkable">
      <bool>true</bool>
     </property>
+    <property name="checked">
+     <bool>false</bool>
+    </property>
     <property name="autoExclusive">
      <bool>true</bool>
     </property>
-    <property name="flat">
+    <property name="toolButtonStyle">
-     <bool>false</bool>
+     <enum>Qt::ToolButtonTextUnderIcon</enum>
+    </property>
+    <property name="autoRaise">
+     <bool>true</bool>
     </property>
    </widget>
-   <widget class="QPushButton" name="heliButton">
+   <widget class="QToolButton" name="heliButton">
     <property name="geometry">
      <rect>
       <x>290</x>
       <y>40</y>
       <width>100</width>
-      <height>100</height>
+      <height>120</height>
      </rect>
     </property>
+    <property name="styleSheet">
+     <string notr="true">QToolButton { border: none }</string>
+    </property>
     <property name="text">
      <string>Helicopter</string>
     </property>
+    <property name="icon">
+     <iconset resource="../wizardResources.qrc">
+      <normaloff>:/setupwizard/resources/bttn-heli-up.png</normaloff>
+      <normalon>:/setupwizard/resources/bttn-heli-down.png</normalon>
+      <activeoff>:/setupwizard/resources/bttn-heli-down.png</activeoff>
+      <activeon>:/setupwizard/resources/bttn-heli-down.png</activeon>:/setupwizard/resources/bttn-heli-up.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>100</width>
+      <height>100</height>
+     </size>
+    </property>
     <property name="checkable">
      <bool>true</bool>
     </property>
     <property name="autoExclusive">
      <bool>true</bool>
     </property>
-    <property name="flat">
+    <property name="toolButtonStyle">
-     <bool>false</bool>
+     <enum>Qt::ToolButtonTextUnderIcon</enum>
+    </property>
+    <property name="autoRaise">
+     <bool>true</bool>
     </property>
    </widget>
-   <widget class="QPushButton" name="surfaceButton">
+   <widget class="QToolButton" name="surfaceButton">
     <property name="geometry">
      <rect>
       <x>410</x>
       <y>40</y>
       <width>100</width>
-      <height>100</height>
+      <height>120</height>
      </rect>
     </property>
     <property name="toolTip">
      <string>Car, Boat, U-Boat</string>
     </property>
+    <property name="styleSheet">
+     <string notr="true">QToolButton { border: none }</string>
+    </property>
     <property name="text">
      <string>Surface</string>
     </property>
+    <property name="icon">
+     <iconset resource="../wizardResources.qrc">
+      <normaloff>:/setupwizard/resources/bttn-land-up.png</normaloff>
+      <normalon>:/setupwizard/resources/bttn-land-down.png</normalon>
+      <activeoff>:/setupwizard/resources/bttn-land-down.png</activeoff>
+      <activeon>:/setupwizard/resources/bttn-land-down.png</activeon>:/setupwizard/resources/bttn-land-up.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>100</width>
+      <height>100</height>
+     </size>
+    </property>
     <property name="checkable">
      <bool>true</bool>
     </property>
     <property name="autoExclusive">
      <bool>true</bool>
     </property>
-    <property name="flat">
+    <property name="toolButtonStyle">
-     <bool>false</bool>
+     <enum>Qt::ToolButtonTextUnderIcon</enum>
+    </property>
+    <property name="autoRaise">
+     <bool>true</bool>
     </property>
    </widget>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="../wizardResources.qrc"/>
+ </resources>
  <connections/>
 </ui>

ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc

@@ -1,3 +1,16 @@
 <RCC>
-    <qresource prefix="/images"/>
+    <qresource prefix="/setupwizard">
+        <file>resources/bttn-heli-down.png</file>
+        <file>resources/bttn-heli-over.png</file>
+        <file>resources/bttn-heli-up.png</file>
+        <file>resources/bttn-land-down.png</file>
+        <file>resources/bttn-land-over.png</file>
+        <file>resources/bttn-land-up.png</file>
+        <file>resources/bttn-multi-down.png</file>
+        <file>resources/bttn-multi-over.png</file>
+        <file>resources/bttn-multi-up.png</file>
+        <file>resources/bttn-plane-down.png</file>
+        <file>resources/bttn-plane-over.png</file>
+        <file>resources/bttn-plane-up.png</file>
+    </qresource>
 </RCC>