From fd46f6968bb5ea11e71eff71e0ac8f68f9f4473e Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Wed, 10 Jan 2018 11:42:43 +0100
Subject: [PATCH] CURA-4461 Show nozzles and buildplates separately depending
 on the hardware_type metadata in variants

---
 resources/qml/Menus/BuildplateMenu.qml |  4 ++--
 resources/qml/Menus/NozzleMenu.qml     | 13 +++++++++++--
 resources/qml/SidebarHeader.qml        |  8 ++++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/resources/qml/Menus/BuildplateMenu.qml b/resources/qml/Menus/BuildplateMenu.qml
index 10e248aaed..c379992386 100644
--- a/resources/qml/Menus/BuildplateMenu.qml
+++ b/resources/qml/Menus/BuildplateMenu.qml
@@ -12,7 +12,6 @@ Menu
     id: menu
     title: "Build plate"
 
-    property int buildplateIndex: 0
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
     property bool isClusterPrinter:
     {
@@ -66,13 +65,14 @@ Menu
             filter:
             {
                 "type": "variant",
+                "hardware_type": "buildplate",
                 "definition": Cura.MachineManager.activeDefinitionId //Only show variants of this machine
             }
         }
         MenuItem {
             text: model.name
             checkable: true
-            checked: model.id == Cura.MachineManager.buildplateIds[buildplateIndex]
+//            checked: model.id == Cura.MachineManager.buildplateIds[buildplateIndex]
             exclusiveGroup: group
             onTriggered:
             {
diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml
index f70e639872..cc3ea66b07 100644
--- a/resources/qml/Menus/NozzleMenu.qml
+++ b/resources/qml/Menus/NozzleMenu.qml
@@ -68,8 +68,17 @@ Menu
         {
             filter:
             {
-                "type": "variant",
-                "definition": Cura.MachineManager.activeQualityDefinitionId //Only show variants of this machine
+                var filter_dict =
+                {
+                    "type": "variant",
+                    "definition": Cura.MachineManager.activeQualityDefinitionId //Only show variants of this machine
+                }
+                if (Cura.MachineManager.hasVariantBuildplates)
+                {
+                    filter_dict["hardware_type"] = "nozzle"
+                }
+
+                return filter_dict
             }
         }
         MenuItem {
diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml
index 4ddd3c7ace..e66da9da5e 100644
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@@ -242,7 +242,7 @@ Column
         Label
         {
             id: materialLabel
-            text: catalog.i18nc("@label","Material");
+            text: catalog.i18nc("@label", "Material");
             width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
@@ -279,7 +279,7 @@ Column
     {
         id: variantRow
         height: UM.Theme.getSize("sidebar_setup").height
-        visible: Cura.MachineManager.hasBuildPlateVariant && !sidebar.monitoringPrint && !sidebar.hideSettings
+        visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings
 
         anchors
         {
@@ -332,7 +332,7 @@ Column
         Label
         {
             id: bulidplateLabel
-            text: catalog.i18nc("@label","Buildplate");
+            text: catalog.i18nc("@label", "Build plate");
             width: Math.floor(parent.width * 0.45 - UM.Theme.getSize("default_margin").width)
             font: UM.Theme.getFont("default");
             color: UM.Theme.getColor("text");
@@ -350,7 +350,7 @@ Column
             style: UM.Theme.styles.sidebar_header_button
             activeFocusOnPress: true;
 
-            menu: BuildplateMenu
+            menu: BuildplateMenu {}
         }
     }