From c50cae6d28268fab23fe1e615165f449c1dba1aa Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 15 Sep 2016 17:43:25 +0200
Subject: [PATCH] Fix showing additional components for UM3Ex

CURA-2276 and CURA-2277
---
 UM3InfoComponents.qml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/UM3InfoComponents.qml b/UM3InfoComponents.qml
index b5a707b280..a5ed944773 100644
--- a/UM3InfoComponents.qml
+++ b/UM3InfoComponents.qml
@@ -10,7 +10,7 @@ Item
 {
     id: base
 
-    property bool isUM3: Cura.MachineManager.activeDefinitionId == "ultimaker3"
+    property bool isUM3: Cura.MachineManager.activeQualityDefinitionId == "ultimaker3"
     property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
     property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
     property bool authenticationRequested: printerConnected && Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 // AuthState.AuthenticationRequested
@@ -28,7 +28,7 @@ Item
             text: catalog.i18nc("@action:button", "Request Access")
             style: UM.Theme.styles.sidebar_action_button
             onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication()
-            visible: printerConnected && !base.printerAcceptsCommands && !base.authenticationRequested
+            visible: printerConnected && !printerAcceptsCommands && !authenticationRequested
         }
 
         Button
@@ -38,7 +38,7 @@ Item
             text: catalog.i18nc("@action:button", "Connect")
             style: UM.Theme.styles.sidebar_action_button
             onClicked: connectActionDialog.show()
-            visible: !base.printerConnected
+            visible: !printerConnected
         }
     }
 
@@ -71,12 +71,12 @@ Item
             tooltip: catalog.i18nc("@info:tooltip", "Send access request to the printer")
             text: catalog.i18nc("@action:button", "Request Access")
             onClicked: Cura.MachineManager.printerOutputDevices[0].requestAuthentication()
-            visible: base.printerConnected && !base.printerAcceptsCommands && !base.authenticationRequested
+            visible: printerConnected && !printerAcceptsCommands && !authenticationRequested
         }
 
         Row
         {
-            visible: base.printerConnected
+            visible: printerConnected
             spacing: UM.Theme.getSize("default_margin").width
 
             anchors.left: parent.left
@@ -115,7 +115,7 @@ Item
         {
             tooltip: catalog.i18nc("@info:tooltip", "Load the configuration of the printer into Cura")
             text: catalog.i18nc("@action:button", "Activate Configuration")
-            visible: base.printerConnected
+            visible: printerConnected
             onClicked: manager.loadConfigurationFromPrinter()
         }
     }