From 6e6333bf02974a3d76d4b0169b0b824a5404a9fe Mon Sep 17 00:00:00 2001
From: Valentin Platzgummer <valentin.platzgummer@ymail.com>
Date: Thu, 13 Feb 2020 00:19:21 +0100
Subject: [PATCH] wima menu adapted

---
 src/FactSystem/Fact.h                       | 4 ++--
 src/FlightDisplay/FlightDisplayWimaMenu.qml | 9 +++++++--
 src/MissionManager/MissionItem.h            | 7 ++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/FactSystem/Fact.h b/src/FactSystem/Fact.h
index f8ffcc158..a95cdeb5f 100644
--- a/src/FactSystem/Fact.h
+++ b/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;
 };
 
diff --git a/src/FlightDisplay/FlightDisplayWimaMenu.qml b/src/FlightDisplay/FlightDisplayWimaMenu.qml
index 8e9b4e3d6..471279ec8 100644
--- a/src/FlightDisplay/FlightDisplayWimaMenu.qml
+++ b/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 {
diff --git a/src/MissionManager/MissionItem.h b/src/MissionManager/MissionItem.h
index f8864d9e6..7a6f2762d 100644
--- a/src/MissionManager/MissionItem.h
+++ b/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;
@@ -134,6 +131,10 @@ private:
     Fact    _param5Fact;
     Fact    _param6Fact;
     Fact    _param7Fact;
+
+    int     _sequenceNumber;
+    int     _doJumpId;
+    bool    _isCurrentItem;
     
     // Keys for Json save
     static const char*  _jsonFrameKey;
-- 
2.22.0