Merge pull request #2024 from DonLakeFlyer/UIChanges

More UI changes for tablet

src/AutoPilotPlugins/PX4/AirframeComponent.qml

@@ -96,30 +96,18 @@ QGCView {
 
         readonly property real spacerHeight: ScreenTools.defaultFontPixelHeight
 
-        QGCLabel {
-            id:             header
-            width:          parent.width
-            font.pixelSize: ScreenTools.largeFontPixelSize
-            text:           "AIRFRAME CONFIG"
-        }
-
-        Item {
-            id:             headingSpacer
-            anchors.top:    header.bottom
-            height:         parent.spacerHeight
-            width:          20
-        }
-
         Item {
             id:             helpApplyRow
-            anchors.top:    headingSpacer.bottom
-            width:          parent.width
+            anchors.top:    parent.top
+            anchors.left:   parent.left
+            anchors.right:  parent.right
             height:         Math.max(helpText.contentHeight, applyButton.height)
 
             QGCLabel {
                 id:             helpText
                 width:          parent.width - applyButton.width - 5
                 text:           "Please select your airframe type. Click 'Apply and Restart' to reboot the autopilot. Please re-connect then manually."
+                font.pixelSize: ScreenTools.mediumFontPixelSize
                 wrapMode:       Text.WordWrap
             }
 

src/AutoPilotPlugins/PX4/FlightModesComponent.qml

@@ -42,7 +42,7 @@ QGCView {
 
     // User visible strings
 
-    readonly property string title:                     "FLIGHT MODES CONFIG"
+    readonly property string title:                     "FLIGHT MODES"
 
 
     property string topHelpText:                        "Assign Flight Modes to radio control channels and adjust the thresholds for triggering them. " +
@@ -216,23 +216,8 @@ QGCView {
                 id:     scrollItem
                 width:  scroll.viewport.width
 
-                QGCLabel {
-                    id:             header
-                    width:          parent.width
-                    font.pixelSize: ScreenTools.largeFontPixelSize
-                    text:           title
-                }
-
-                Item {
-                    id:             headingSpacer
-                    anchors.top:    header.bottom
-                    height:         ScreenTools.defaultFontPixelHeight
-                    width:          20
-                }
-
                 Item {
                     id:             helpApplyRow
-                    anchors.top:    headingSpacer.bottom
                     width:          parent.width
                     height:         Math.max(helpText.contentHeight, applyButton.height)
 
@@ -242,6 +227,7 @@ QGCView {
                         anchors.left:           parent.left
                         anchors.right:          applyButton.left
                         text:                   topHelpText
+                        font.pixelSize:         ScreenTools.mediumFontPixelSize
                         wrapMode:               Text.WordWrap
                     }
 

src/AutoPilotPlugins/PX4/PowerComponent.qml

@@ -115,11 +115,6 @@ QGCView {
                 anchors.right:  parent.right
                 spacing:        ScreenTools.defaultFontPixelHeight
 
-                QGCLabel {
-                    text: "POWER CONFIG"
-                    font.pixelSize: ScreenTools.largeFontPixelSize
-                }
-
                 QGCLabel {
                     text: "Battery"
                     font.pixelSize: ScreenTools.mediumFontPixelSize

src/AutoPilotPlugins/PX4/RadioComponent.qml

@@ -42,7 +42,7 @@ QGCView {
 
     QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
 
-    readonly property string dialogTitle: "Radio Config"
+    readonly property string dialogTitle: "Radio"
     readonly property real labelToMonitorMargin: defaultTextWidth * 3
     property bool controllerCompleted: false
     property bool controllerAndViewReady: false
@@ -269,23 +269,10 @@ QGCView {
 
         // Main view Qml starts here
 
-        QGCLabel {
-            id:             header
-            font.pixelSize: ScreenTools.largeFontPixelSize
-            text:           "RADIO CONFIG"
-        }
-
-        Item {
-            id:             spacer
-            anchors.top:    header.bottom
-            width:          parent.width
-            height:         10
-        }
-
         // Left side column
         Column {
             id:             leftColumn
-            anchors.top:    spacer.bottom
+            anchors.top:    parent.top
             anchors.left:   parent.left
             anchors.right:  columnSpacer.left
             spacing:        10
@@ -504,7 +491,7 @@ QGCView {
         // Right side column
         Column {
             id:             rightColumn
-            anchors.top:    spacer.bottom
+            anchors.top:    parent.top
             anchors.right:  parent.right
             width:          defaultTextWidth * 35
             spacing:        10

src/AutoPilotPlugins/PX4/SafetyComponent.qml

@@ -56,13 +56,6 @@ QGCView {
         Column {
             anchors.fill: parent
 
-            QGCLabel {
-                text:           "SAFETY CONFIG"
-                font.pixelSize: ScreenTools.largeFontPixelSize
-            }
-
-            Item { height: 20; width: 10 } // spacer
-
             //-----------------------------------------------------------------
             //-- Return Home Triggers
 

src/AutoPilotPlugins/PX4/SensorsComponent.qml

@@ -278,13 +278,6 @@ QGCView {
         Column {
             anchors.fill: parent
 
-            QGCLabel {
-                text: "SENSORS CONFIG"
-                font.pixelSize: ScreenTools.largeFontPixelSize
-            }
-
-            Item { height: ScreenTools.defaultFontPixelHeight; width: 10 } // spacer
-
             Row {
                 readonly property int buttonWidth: ScreenTools.defaultFontPixelWidth * 15
 

src/QGCApplication.cc

@@ -296,8 +296,9 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     QSettings::setDefaultFormat(QSettings::IniFormat);
 
     QSettings settings;
+    qDebug() << "Settings location" << settings.fileName() << settings.isWritable();
+
 #ifdef UNITTEST_BUILD
-    qDebug() << "Settings location" << settings.fileName();
     Q_ASSERT(settings.isWritable());
 #endif
     // The setting will delete all settings on this boot
@@ -316,7 +317,6 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
 
     // Initialize Video Streaming
     initializeVideoStreaming(argc, argv);
-
 }
 
 QGCApplication::~QGCApplication()
@@ -421,6 +421,8 @@ void QGCApplication::_initCommon(void)
     }
     qDebug() << "Saved files location" << savedFilesLocation;
     settings.setValue(_savedFilesLocationKey, savedFilesLocation);
+
+    settings.sync();
 }
 
 bool QGCApplication::_initForNormalAppBoot(void)

src/QGCMessageBox.h

@@ -107,10 +107,11 @@ private:
             }
         }
 
+        qDebug() << "QGCMessageBox (unit testing)" << title << text;
+
 #ifdef QT_DEBUG
 #ifndef __mobile__
         if (qgcApp()->runningUnitTests()) {
-            qDebug() << "QGCMessageBox (unit testing)" << title << text;
             return UnitTest::_messageBox(icon, title, text, buttons, defaultButton);
         } else
 #endif

src/QmlControls/ParameterEditor.qml

@@ -212,6 +212,8 @@ QGCView {
                 width:	defaultTextWidth * 25
                 height: parent.height
 
+                Component.onCompleted: flickableItem.flickableDirection = Flickable.VerticalFlick
+
                 Column {
                     Repeater {
                         model: controller.componentIds
@@ -317,8 +319,8 @@ QGCView {
 
                 QGCLabel {
                     id:             titleText
-                    font.pixelSize: ScreenTools.largeFontPixelSize
-                    text:           "PARAMETER EDITOR"
+                    font.pixelSize: ScreenTools.mediumFontPixelSize
+                    text:           "PARAMETERS"
                 }
 
                 QGCButton {

src/VehicleSetup/FirmwareUpgrade.qml

@@ -38,7 +38,7 @@ QGCView {
     viewPanel:  panel
 
     // User visible strings
-    readonly property string title:             "FIRMWARE UPDATE"
+    readonly property string title:             "FIRMWARE"
     readonly property string highlightPrefix:   "<font color=\"yellow\">"
     readonly property string highlightSuffix:   "</font>"
     readonly property string welcomeText:       "QGroundControl can upgrade the firmware on Pixhawk devices, 3DR Radios and PX4 Flow Smart Cameras."
@@ -392,7 +392,7 @@ QGCView {
         QGCLabel {
             id:             titleLabel
             text:           title
-            font.pixelSize: ScreenTools.largeFontPixelSize
+            font.pixelSize: ScreenTools.mediumFontPixelSize
         }
 
         ProgressBar {

src/VehicleSetup/JoystickConfig.qml

@@ -149,8 +149,8 @@ QGCView {
 
         QGCLabel {
             id:             header
-            font.pixelSize: ScreenTools.largeFontPixelSize
-            text:           "JOYSTICK CONFIG"
+            font.pixelSize: ScreenTools.mediumFontPixelSize
+            text:           "JOYSTICK"
         }
 
         Item {

src/VehicleSetup/VehicleSummary.qml

@@ -43,16 +43,11 @@ Rectangle {
         anchors.fill:   parent
         spacing:        ScreenTools.defaultFontPixelHeight
 
-        QGCLabel {
-            text:           "VEHICLE SUMMARY"
-            font.pixelSize: ScreenTools.largeFontPixelSize
-        }
-
         QGCLabel {
             width:			parent.width
 			wrapMode:		Text.WordWrap
 			color:			setupComplete ? qgcPal.text : qgcPal.warningText
-            font.pixelSize: setupComplete ? ScreenTools.defaultFontPixelSize : ScreenTools.mediumFontPixelSize
+            font.pixelSize: ScreenTools.mediumFontPixelSize
 			text:           setupComplete ?
                                 "Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." :
                                 "WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left."

src/ui/toolbar/MainToolBar.qml

@@ -193,6 +193,15 @@ Item {
                 _controller.onPlanView();
             }
         }
+
+        MenuSeparator { }
+
+
+        MenuItem {
+            text:           "QGroundControl Settings"
+
+            onTriggered: controller.showSettings()
+        }
     } // Menu
 
     Component {

src/ui/toolbar/MainToolBarController.cc

@@ -339,3 +339,8 @@ void MainToolBarController::onToolBarMessageClosed(void)
     _toolbarMessageVisible = false;
     _delayedShowToolBarMessage();
 }
+
+void MainToolBarController::showSettings(void)
+{
+    MainWindow::instance()->showSettings();
+}

src/ui/toolbar/MainToolBarController.h

@@ -57,6 +57,7 @@ public:
     Q_INVOKABLE void    onDisconnect(QString conf);
     Q_INVOKABLE void    onEnterMessageArea(int x, int y);
     Q_INVOKABLE void    onToolBarMessageClosed(void);
+    Q_INVOKABLE void    showSettings(void);
 
     Q_PROPERTY(double       height              MEMBER _toolbarHeight           NOTIFY heightChanged)
     Q_PROPERTY(QStringList  configList          MEMBER _linkConfigurations      NOTIFY configListChanged)