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 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jack Ha 2016-09-12 13:55:14 +02:00
commit 78c119dbde
3 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/MonitorButton.qml
View file

@ -48,7 +48,13 @@ Rectangle
{
if(!printerConnected || !printerAcceptsCommands)
return UM.Theme.getColor("text");
if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
{
return UM.Theme.getColor("status_busy");
} else if (Cura.MachineManager.printerOutputDevices[0].printerState == "error")
{
return UM.Theme.getColor("status_stopped");
}
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{
case "printing":
@ -80,6 +86,11 @@ Rectangle
return catalog.i18nc("@label:MonitorStatus", "Printer does not accept commands");
var printerOutputDevice = Cura.MachineManager.printerOutputDevices[0]
if(printerOutputDevice.printerState == "maintenance")
{
return catalog.i18nc("@label:MonitorStatus", "Printer is in maintenance mode.");
}
switch(printerOutputDevice.jobState)
{
case "offline":

5
resources/qml/Sidebar.qml
View file

@ -112,6 +112,11 @@ Rectangle
else if(!printerAcceptsCommands)
return UM.Theme.getIcon("tab_monitor_unknown");
if(Cura.MachineManager.printerOutputDevices[0].printerState == "maintenance")
{
return UM.Theme.getIcon("tab_monitor_busy");
}
switch(Cura.MachineManager.printerOutputDevices[0].jobState)
{
case "printing":