From bb7bd77a437eef3334600f037632b8a5baf316fc Mon Sep 17 00:00:00 2001
From: Gus Grubba <gus@auterion.com>
Date: Mon, 22 Apr 2019 23:04:35 -0300
Subject: [PATCH] Update setup menu option when the setup view is invoked from
 the c++ side

---
 src/ui/MainRootWindow.qml      | 25 +++++++++++++------------
 src/ui/toolbar/MainToolBar.qml | 11 +++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/ui/MainRootWindow.qml b/src/ui/MainRootWindow.qml
index 233922f..1cc3f0d 100644
--- a/src/ui/MainRootWindow.qml
+++ b/src/ui/MainRootWindow.qml
@@ -30,10 +30,11 @@ ApplicationWindow {
     readonly property real      _topBottomMargins:          ScreenTools.defaultFontPixelHeight * 0.5
     readonly property string    _mainToolbar:               QGroundControl.corePlugin.options.mainToolbarUrl
     readonly property string    _planToolbar:               QGroundControl.corePlugin.options.planToolbarUrl
-    readonly property string    _settingsViewSource:        "AppSettings.qml"
-    readonly property string    _setupViewSource:           "SetupView.qml"
-    readonly property string    _planViewSource:            "PlanView.qml"
-    readonly property string    _analyzeViewSource:         !ScreenTools.isMobile ? "AnalyzeView.qml" : "MavlinkConsolePage.qml"
+
+    readonly property string    settingsViewSource:         "AppSettings.qml"
+    readonly property string    setupViewSource:            "SetupView.qml"
+    readonly property string    planViewSource:             "PlanView.qml"
+    readonly property string    analyzeViewSource:          !ScreenTools.isMobile ? "AnalyzeView.qml" : "MavlinkConsolePage.qml"
 
     //-------------------------------------------------------------------------
     //-- Global Scope Variables
@@ -87,29 +88,29 @@ ApplicationWindow {
 
     function showPlanView() {
         viewSwitch(true)
-        if (mainContentWindow.source !== _planViewSource) {
-            mainContentWindow.source  = _planViewSource
+        if (mainContentWindow.source !== planViewSource) {
+            mainContentWindow.source  = planViewSource
         }
     }
 
     function showAnalyzeView() {
         viewSwitch(false)
-        if (mainContentWindow.source !== _analyzeViewSource) {
-            mainContentWindow.source  = _analyzeViewSource
+        if (mainContentWindow.source !== analyzeViewSource) {
+            mainContentWindow.source  = analyzeViewSource
         }
     }
 
     function showSetupView() {
         viewSwitch(false)
-        if (mainContentWindow.source !== _setupViewSource) {
-            mainContentWindow.source  = _setupViewSource
+        if (mainContentWindow.source !== setupViewSource) {
+            mainContentWindow.source  = setupViewSource
         }
     }
 
     function showSettingsView() {
         viewSwitch(false)
-        if (mainContentWindow.source !== _settingsViewSource) {
-            mainContentWindow.source  = _settingsViewSource
+        if (mainContentWindow.source !== settingsViewSource) {
+            mainContentWindow.source  = settingsViewSource
         }
     }
 
diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index af06428..c2d2b55 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -36,6 +36,17 @@ Item {
         visible:        qgcPal.globalTheme === QGCPalette.Light
     }
 
+    //-- Setup can be invoked from c++ side
+    Connections {
+        target: mainContentWindow
+        onSourceChanged: {
+            console.log(mainContentWindow.source)
+            if(mainContentWindow.source.toString().endsWith(setupViewSource)) {
+                setupButton.checked = true
+            }
+        }
+    }
+
     RowLayout {
         anchors.bottomMargin:   1
         anchors.rightMargin:    ScreenTools.defaultFontPixelWidth / 2