From 9f52a52ea3ee9e497c8b7dc220a9077ad7c64c59 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Tue, 18 Dec 2018 09:32:11 +0100
Subject: [PATCH 1/3] Fix ExtruderModel reference in machine settings dialog

---
 .../MachineSettingsAction.qml                     | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index d8efe6f8b8..a9900070a8 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -14,20 +14,9 @@ Cura.MachineAction
 {
     id: base
     property var extrudersModel: CuraApplication.getExtrudersModel()
-    property int extruderTabsCount: 0
 
     property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : ""
 
-    Connections
-    {
-        target: base.extrudersModel
-        onModelChanged:
-        {
-            var extruderCount = base.extrudersModel.count;
-            base.extruderTabsCount = extruderCount;
-        }
-    }
-
     Connections
     {
         target: dialog ? dialog : null
@@ -357,11 +346,11 @@ Cura.MachineAction
             Repeater
             {
                 id: extruderTabsRepeater
-                model: base.extruderTabsCount
+                model: base.extrudersModel
 
                 Tab
                 {
-                    title: base.extrudersModel.getItem(index).name
+                    title: model.name
                     anchors.margins: UM.Theme.getSize("default_margin").width
 
                     Column

From 1ac5403c21a6b55f372f19329328ef618ecf03fb Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Tue, 18 Dec 2018 15:52:26 +0100
Subject: [PATCH 2/3] Remove extruder tabs from tabView CURA-6036

---
 .../MachineSettingsAction/MachineSettingsAction.qml   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index a9900070a8..60dd31dcae 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -348,6 +348,17 @@ Cura.MachineAction
                 id: extruderTabsRepeater
                 model: base.extrudersModel
 
+
+                onItemAdded:
+                {
+                    settingsTabs.addTab(index + 1, item)
+                }
+
+                onItemRemoved:
+                {
+                    settingsTabs.removeTab(index + 1)
+                }
+
                 Tab
                 {
                     title: model.name

From 7cf1df74354022c5cceba84ae8ab304ad0d16b1e Mon Sep 17 00:00:00 2001
From: Aleksei S <a.sasin@ultimaker.com>
Date: Tue, 18 Dec 2018 16:19:21 +0100
Subject: [PATCH 3/3] Remove back Cura.ExtrudersModel{}, because if retrieve
 the model from backend the tabs cannot be removed after model update. The QML
 bug CURA-6036

---
 .../MachineSettingsAction.qml                 | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml
index 60dd31dcae..ef8fda224a 100644
--- a/plugins/MachineSettingsAction/MachineSettingsAction.qml
+++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml
@@ -13,10 +13,22 @@ import Cura 1.0 as Cura
 Cura.MachineAction
 {
     id: base
-    property var extrudersModel: CuraApplication.getExtrudersModel()
+    property var extrudersModel: Cura.ExtrudersModel{} // Do not retrieve the Model from a backend. Otherwise the tabs
+                                                       // in tabView will not removed/updated. Probably QML bug
+    property int extruderTabsCount: 0
 
     property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : ""
 
+    Connections
+    {
+        target: base.extrudersModel
+        onModelChanged:
+        {
+            var extruderCount = base.extrudersModel.count;
+            base.extruderTabsCount = extruderCount;
+        }
+    }
+
     Connections
     {
         target: dialog ? dialog : null
@@ -346,22 +358,11 @@ Cura.MachineAction
             Repeater
             {
                 id: extruderTabsRepeater
-                model: base.extrudersModel
-
-
-                onItemAdded:
-                {
-                    settingsTabs.addTab(index + 1, item)
-                }
-
-                onItemRemoved:
-                {
-                    settingsTabs.removeTab(index + 1)
-                }
+                model: base.extruderTabsCount
 
                 Tab
                 {
-                    title: model.name
+                    title: base.extrudersModel.getItem(index).name
                     anchors.margins: UM.Theme.getSize("default_margin").width
 
                     Column