From a1a9b058f5e874f0ab41871afc94a7ac712badd0 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 13 Dec 2018 14:28:32 +0100
Subject: [PATCH 1/4] Let header listen to activeStageId instead of the model

CURA-6028
---
 resources/qml/MainWindow/MainWindowHeader.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index ae1c13d9c3..6cb7370ec2 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -54,7 +54,8 @@ Item
             {
                 text: model.name.toUpperCase()
                 checkable: true
-                checked: model.active
+                checked: model.id == UM.Controller.activeStage.stageId
+
                 anchors.verticalCenter: parent.verticalCenter
                 exclusiveGroup: mainWindowHeaderMenuGroup
                 style: UM.Theme.styles.main_window_header_tab

From c4700b27522dafa6d2164ea08b2215e1f738e013 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 13 Dec 2018 14:30:00 +0100
Subject: [PATCH 2/4] Also update the model if the data changed

CURA-6028
---
 .../Recommended/RecommendedQualityProfileSelector.qml            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
index 15d40f545a..349c6dbb57 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
@@ -39,6 +39,7 @@ Item
     {
         target: Cura.QualityProfilesDropDownMenuModel
         onItemsChanged: qualityModel.update()
+        onDataChanged: qualityModel.update()
     }
 
     Connections {

From 1b3cb323344cd6c75ec160ca936a1aff379ad64f Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 13 Dec 2018 15:59:15 +0100
Subject: [PATCH 3/4] Fix the simulation view not being selected as default

CURA-6028
---
 resources/qml/ViewsSelector.qml | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/resources/qml/ViewsSelector.qml b/resources/qml/ViewsSelector.qml
index 0e2598a0d8..d91412cad0 100644
--- a/resources/qml/ViewsSelector.qml
+++ b/resources/qml/ViewsSelector.qml
@@ -14,24 +14,31 @@ Cura.ExpandablePopup
     contentPadding: UM.Theme.getSize("default_lining").width
     contentAlignment: Cura.ExpandablePopup.ContentAlignment.AlignLeft
 
-    property var viewModel: UM.ViewModel { }
-
-    property var activeView:
+    property var viewModel: UM.ViewModel
     {
-        for (var i = 0; i < viewModel.count; i++)
+        onDataChanged: updateActiveView()
+    }
+
+
+    property var activeView: null
+
+    function updateActiveView()
+    {
+        for (var index in viewModel.items)
         {
-            if (viewModel.items[i].active)
+
+            if (viewModel.items[index].active)
             {
-                return viewModel.items[i]
+                activeView = viewModel.items[index]
+                return
             }
         }
-        return null
+        activeView = null
     }
 
     Component.onCompleted:
     {
-        // Nothing was active, so just return the first one (the list is sorted by priority, so the most
-        // important one should be returned)
+        updateActiveView()
         if (activeView == null)
         {
             UM.Controller.setActiveView(viewModel.getItem(0).id)

From 012ee0c02a66ef4e1bbbc5dde6aee8d8fec9988a Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Thu, 13 Dec 2018 16:44:49 +0100
Subject: [PATCH 4/4] Use the MouseArea trick to assure that the binding still
 works for the checked property of the button.

Contributes to CURA-6028.
---
 resources/qml/MainWindow/MainWindowHeader.qml | 8 +++++++-
 resources/qml/ViewsSelector.qml               | 3 ---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 6cb7370ec2..793df42da0 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -60,11 +60,17 @@ Item
                 exclusiveGroup: mainWindowHeaderMenuGroup
                 style: UM.Theme.styles.main_window_header_tab
                 height: UM.Theme.getSize("main_window_header_button").height
-                onClicked: UM.Controller.setActiveStage(model.id)
                 iconSource: model.stage.iconSource
 
                 property color overlayColor: "transparent"
                 property string overlayIconSource: ""
+
+                // This is a trick to assure the activeStage is correctly changed. It doesn't work propertly if done in the onClicked (see CURA-6028)
+                MouseArea
+                {
+                    anchors.fill: parent
+                    onClicked: UM.Controller.setActiveStage(model.id)
+                }
             }
         }
 
diff --git a/resources/qml/ViewsSelector.qml b/resources/qml/ViewsSelector.qml
index d91412cad0..06d2e662b5 100644
--- a/resources/qml/ViewsSelector.qml
+++ b/resources/qml/ViewsSelector.qml
@@ -19,14 +19,12 @@ Cura.ExpandablePopup
         onDataChanged: updateActiveView()
     }
 
-
     property var activeView: null
 
     function updateActiveView()
     {
         for (var index in viewModel.items)
         {
-
             if (viewModel.items[index].active)
             {
                 activeView = viewModel.items[index]
@@ -38,7 +36,6 @@ Cura.ExpandablePopup
 
     Component.onCompleted:
     {
-        updateActiveView()
         if (activeView == null)
         {
             UM.Controller.setActiveView(viewModel.getItem(0).id)