3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make remove manual device (also) work (as failure-state of add manual device). [CURA-6294]

Browse source
This commit is contained in:
Remco Burema 2019-03-21 18:45:57 +01:00
parent f13ceb2a4d
commit 8250c91fc4
2 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -113,6 +113,12 @@ Item
! addPrinterByIpScreen.haveConnection
}
}
Connections
{
target: UM.OutputDeviceManager
onManualDeviceChanged: { addPrinterButton.enabled = ! UM.OutputDeviceManager.hasManualDevice }
}
}
}
@ -172,9 +178,18 @@ Item
target: UM.OutputDeviceManager
onManualDeviceChanged:
{
typeText.text = UM.OutputDeviceManager.manualDeviceProperty("printer_type")
firmwareText.text = UM.OutputDeviceManager.manualDeviceProperty("firmware_version")
addressText.text = UM.OutputDeviceManager.manualDeviceProperty("address")
if (UM.OutputDeviceManager.hasManualDevice)
{
typeText.text = UM.OutputDeviceManager.manualDeviceProperty("printer_type")
firmwareText.text = UM.OutputDeviceManager.manualDeviceProperty("firmware_version")
addressText.text = UM.OutputDeviceManager.manualDeviceProperty("address")
}
else
{
typeText.text = ""
firmwareText.text = ""
addressText.text = ""
}
}
}
}
@ -184,8 +199,17 @@ Item
target: UM.OutputDeviceManager
onManualDeviceChanged:
{
printerNameLabel.text = UM.OutputDeviceManager.manualDeviceProperty("name")
addPrinterByIpScreen.haveConnection = true
if (UM.OutputDeviceManager.hasManualDevice)
{
printerNameLabel.text = UM.OutputDeviceManager.manualDeviceProperty("name")
addPrinterByIpScreen.haveConnection = true
}
else
{
printerNameLabel.text = catalog.i18nc("@label", "Could not connect to device.")
addPrinterByIpScreen.hasSentRequest = false
addPrinterByIpScreen.haveConnection = false
}
}
}
}