Cleaned up view mode selection

src/ui/main/QGCViewModeSelection.ui

@@ -14,6 +14,13 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
+   <item row="3" column="1">
+    <widget class="QCheckBox" name="notAgainCheckBox">
+     <property name="text">
+      <string>Do not ask again on next startup. The selection can be changed any time in the preferences.</string>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <spacer name="horizontalSpacer">
      <property name="orientation">
@@ -27,17 +34,30 @@
      </property>
     </spacer>
    </item>
+   <item row="2" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>46</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="2" column="1">
     <widget class="QWidget" name="viewModeWidget" native="true">
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="2">
-       <widget class="QPushButton" name="viewModePX4">
+      <item row="1" column="1">
+       <widget class="QPushButton" name="viewModeAR">
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../../qgroundcontrol.qrc">
-          <normaloff>:/files/images/actions/qgroundcontrol-px4.svg</normaloff>:/files/images/actions/qgroundcontrol-px4.svg</iconset>
+          <normaloff>:/files/images/actions/qgroundcontrol-wifi.svg</normaloff>:/files/images/actions/qgroundcontrol-wifi.svg</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -47,27 +67,28 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0" colspan="4">
-       <spacer name="verticalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
+      <item row="2" column="3">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>APM Autopilot</string>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>PX4 Autopilot</string>
         </property>
-       </spacer>
+       </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QPushButton" name="viewModeGeneric">
+      <item row="1" column="3">
+       <widget class="QPushButton" name="viewModeAPM">
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../../qgroundcontrol.qrc">
-          <normaloff>:/files/images/actions/qgroundcontrol-generic.svg</normaloff>:/files/images/actions/qgroundcontrol-generic.svg</iconset>
+          <normaloff>:/files/images/actions/qgroundcontrol-apm.svg</normaloff>:/files/images/actions/qgroundcontrol-apm.svg</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -77,21 +98,21 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="label">
+      <item row="2" column="1">
+       <widget class="QLabel" name="label_4">
         <property name="text">
-         <string>Radio / Serial Link</string>
+         <string>WiFi / UDP</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="viewModeAR">
+      <item row="1" column="2">
+       <widget class="QPushButton" name="viewModePX4">
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../../qgroundcontrol.qrc">
-          <normaloff>:/files/images/actions/qgroundcontrol-wifi.svg</normaloff>:/files/images/actions/qgroundcontrol-wifi.svg</iconset>
+          <normaloff>:/files/images/actions/qgroundcontrol-px4.svg</normaloff>:/files/images/actions/qgroundcontrol-px4.svg</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -101,35 +122,14 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>PX4 Autopilot</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>WiFi / UDP</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string>APM Autopilot</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="viewModeAPM">
+      <item row="1" column="0">
+       <widget class="QPushButton" name="viewModeGeneric">
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../../qgroundcontrol.qrc">
-          <normaloff>:/files/images/actions/qgroundcontrol-apm.svg</normaloff>:/files/images/actions/qgroundcontrol-apm.svg</iconset>
+          <normaloff>:/files/images/actions/qgroundcontrol-generic.svg</normaloff>:/files/images/actions/qgroundcontrol-generic.svg</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -139,29 +139,16 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="4">
-       <widget class="QCheckBox" name="notAgainCheckBox">
+      <item row="2" column="0">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Do not ask again on next startup</string>
+         <string>Radio / Serial Link</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>76</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="1" column="1">
     <widget class="QLabel" name="viewModeHintLabel">
      <property name="text">
@@ -169,7 +156,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="5" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -182,26 +169,19 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="2">
-    <spacer name="horizontalSpacer_2">
+   <item row="0" column="1">
+    <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>46</width>
-       <height>20</height>
+       <width>20</width>
+       <height>76</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="3" column="1">
-    <widget class="QLabel" name="viewModeExplanationLabel">
-     <property name="text">
-      <string>The selection can be changed any time in the preferences.</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>