3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-01 14:51:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'feature_sync_button' of github.com:Ultimaker/Cura into feature_sync_button

Browse source 
Fix some conflicts
This commit is contained in:
Diego Prado Gesto 2018-03-09 15:16:21 +01:00
commit 8a48503104
7 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/MachineSelection.qml
View file

@ -13,7 +13,7 @@ import "Menus"
ToolButton {
id: base
property var isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
property var printerStatus: Cura.MachineManager.printerOutputDevices.length != 0 ? "connected" : "unknown"
property var printerStatus: Cura.MachineManager.printerOutputDevices.length != 0 ? "connected" : "disconnected"
text: isNetworkPrinter ? Cura.MachineManager.activeMachineNetworkGroupName : Cura.MachineManager.activeMachineName
tooltip: Cura.MachineManager.activeMachineName