Merge branch 'master' of ssh://squid.nt.tuwien.ac.at:22103/platzgummer/qgroundcontrol

src/FactSystem/Fact.h

@@ -205,13 +205,13 @@ protected:
     void _sendValueChangedSignal(QVariant value);
 
     QString                     _name;
-    int                         _componentId;
     QVariant                    _rawValue;
     FactMetaData::ValueType_t   _type;
     FactMetaData*               _metaData;
+    FactValueSliderListModel*   _valueSliderModel;
+    int                         _componentId;
     bool                        _sendValueChangedSignals;
     bool                        _deferredValueChangeSignal;
-    FactValueSliderListModel*   _valueSliderModel;
     bool                        _ignoreQGCRebootRequired;
 };
 

src/FlightDisplay/FlightDisplayWimaMenu.qml

@@ -162,7 +162,7 @@ Item {
 
                     SectionHeader{
                         id: missionHeader
-                        text: qsTr("Mission")
+                        text: qsTr("Phase Settings")
                     }
                     GridLayout {
                         columns: 2
@@ -244,11 +244,16 @@ Item {
 
                     }
 
+                    SectionHeader{
+                        id: navigateHeader
+                        text: qsTr("Navigate")
+                    }
+
                     GridLayout {// Buttons
                         columns: 2
                         rowSpacing:         ScreenTools.defaultFontPixelHeight * 0.5
                         columnSpacing:      ScreenTools.defaultFontPixelHeight * 0.5
-                        visible:            missionHeader.checked
+                        visible:            navigateHeader.checked
                         width:              missionHeader.width
 
                         QGCButton {

src/MissionManager/MissionItem.h

@@ -120,9 +120,6 @@ private:
     bool _convertJsonV1ToV2(const QJsonObject& json, QJsonObject& v2Json, QString& errorString);
     bool _convertJsonV2ToV3(QJsonObject& json, QString& errorString);
 
-    int     _sequenceNumber;
-    int     _doJumpId;
-    bool    _isCurrentItem;
 
     Fact    _autoContinueFact;
     Fact    _commandFact;
@@ -135,6 +132,10 @@ private:
     Fact    _param6Fact;
     Fact    _param7Fact;
 
+    int     _sequenceNumber;
+    int     _doJumpId;
+    bool    _isCurrentItem;
+    
     // Keys for Json save
     static const char*  _jsonFrameKey;
     static const char*  _jsonCommandKey;