3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Cluster can now "target" one of it's printers for display

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-11-30 13:07:01 +01:00
parent a49d3dbd8e
commit dea13899b3
5 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/MonitorButton.qml
View file

@ -70,8 +70,10 @@ Item
property variant statusColor:
{
if(!printerConnected || !printerAcceptsCommands)
if(!printerConnected || !printerAcceptsCommands || activePrinter == null)
{
return UM.Theme.getColor("text");
}
switch(activePrinter.state)
{
@ -117,7 +119,10 @@ Item
}
var printerOutputDevice = Cura.MachineManager.printerOutputDevices[0]
if(activePrinter == null)
{
return "";
}
if(activePrinter.state == "maintenance")
{
return catalog.i18nc("@label:MonitorStatus", "In maintenance. Please check the printer");
@ -262,7 +267,7 @@ Item
property bool userClicked: false
property string lastJobState: ""
visible: printerConnected && activePrinter.canPause
visible: printerConnected && activePrinter != null &&activePrinter.canPause
enabled: (!userClicked) && printerConnected && printerAcceptsCommands && activePrintJob != null &&
(["paused", "printing"].indexOf(activePrintJob.state) >= 0)
@ -305,7 +310,7 @@ Item
{
id: abortButton
visible: printerConnected && activePrinter.canAbort
visible: printerConnected && activePrinter != null && activePrinter.canAbort
enabled: printerConnected && printerAcceptsCommands && activePrintJob != null &&
(["paused", "printing", "pre_print"].indexOf(activePrintJob.state) >= 0)