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

Merge branch '3.3'

Browse source
This commit is contained in:
Ghostkeeper 2018-03-29 08:55:06 +02:00
commit b30df14073
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
58 changed files with 31539 additions and 17824 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/MachineSelection.qml
View file

@ -14,8 +14,8 @@ ToolButton
{
id: base
property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property var printerStatus: Cura.MachineManager.printerOutputDevices.length != 0 ? "connected" : "disconnected"
property bool printerConnected: Cura.MachineManager.printerConnected
property var printerStatus: Cura.MachineManager.printerConnected ? "connected" : "disconnected"
text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
tooltip: Cura.MachineManager.activeMachineName