3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 20:28:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix showing additional components for UM3Ex

Browse source 
CURA-2276 and CURA-2277
This commit is contained in:
fieldOfView 2016-09-15 17:43:25 +02:00
parent 5024581e2e
commit c50cae6d28
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
UM3InfoComponents.qml
View file

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