Merge pull request #1593 from mavlink/text_cleanup

Text cleanup

src/AutoPilotPlugins/PX4/SensorsComponentController.cc

@@ -39,6 +39,7 @@ SensorsComponentController::SensorsComponentController(void) :
     _gyroButton(NULL),
     _accelButton(NULL),
     _airspeedButton(NULL),
+    _levelButton(NULL),
     _cancelButton(NULL),
     _showOrientationCalArea(false),
     _gyroCalInProgress(false),
@@ -106,6 +107,7 @@ void SensorsComponentController::_startVisualCalibration(void)
     _gyroButton->setEnabled(false);
     _accelButton->setEnabled(false);
     _airspeedButton->setEnabled(false);
+    _levelButton->setEnabled(false);
     _cancelButton->setEnabled(true);
     
     _progressBar->setProperty("value", 0);
@@ -119,6 +121,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
     _gyroButton->setEnabled(true);
     _accelButton->setEnabled(true);
     _airspeedButton->setEnabled(true);
+    _levelButton->setEnabled(true);
     _cancelButton->setEnabled(false);
     
     if (code == StopCalibrationSuccess) {
@@ -439,4 +442,4 @@ void SensorsComponentController::cancelCalibration(void)
     emit waitingForCancelChanged();
     _cancelButton->setEnabled(false);
     _uas->stopCalibration();
-}
\ No newline at end of file
+}

src/AutoPilotPlugins/PX4/SensorsComponentController.h

@@ -50,6 +50,7 @@ public:
     Q_PROPERTY(QQuickItem* gyroButton MEMBER _gyroButton)
     Q_PROPERTY(QQuickItem* accelButton MEMBER _accelButton)
     Q_PROPERTY(QQuickItem* airspeedButton MEMBER _airspeedButton)
+    Q_PROPERTY(QQuickItem* levelButton MEMBER _levelButton)
     Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton)
     Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText)
     
@@ -127,6 +128,7 @@ private:
     QQuickItem* _gyroButton;
     QQuickItem* _accelButton;
     QQuickItem* _airspeedButton;
+    QQuickItem* _levelButton;
     QQuickItem* _cancelButton;
     QQuickItem* _orientationCalAreaHelpText;
     

src/VehicleSetup/VehicleSummary.qml

@@ -61,10 +61,8 @@ Rectangle {
 			color:			autopilot.setupComplete ? qgcPal.text : "red"
             font.pointSize: autopilot.setupComplete ? ScreenTools.defaultFontPointSize : ScreenTools.fontPointFactor * (20)
 			text: autopilot.setupComplete ?
-						"Below you will find a summary of the settings for your vehicle. To the left are the setup buttons for deatiled settings for each component." :
-						"WARNING: One or more of your vehicle's components require setup prior to flight. It will be shown with a red circular indicator below. " +
-							"Find the matching setup button to the left and click it to get to the setup screen you need to complete. " +
-							"Once all indicators go green you will be ready to fly."
+                        "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."
         }
 
         Item {