GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 19:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CL-508_correct_status_msg_when_disconnected' into 3.0

Browse Source
This commit is contained in:
Ghostkeeper 2017-10-12 14:48:36 +02:00
commit e6f613248c
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View File

@ -257,6 +257,11 @@ Rectangle
return catalog.i18nc("@label:status", "Disabled"); return catalog.i18nc("@label:status", "Disabled");
} }
if (printer.status === "unreachable")
{
return printerStatusText(printer);
}
if (printJob != null) if (printJob != null)
{ {
switch (printJob.status) switch (printJob.status)
@ -327,6 +332,12 @@ Rectangle
{ {
return "blocked-icon.svg"; return "blocked-icon.svg";
} }
if (printer.status === "unreachable")
{
return "";
}
if (printJob != null) if (printJob != null)
{ {
if(printJob.status === "queued") if(printJob.status === "queued")
@ -378,6 +389,11 @@ Rectangle
return catalog.i18nc("@label", "Not accepting print jobs"); return catalog.i18nc("@label", "Not accepting print jobs");
} }
if (printer.status === "unreachable")
{
return "";
}
if(printJob != null) if(printJob != null)
{ {
switch (printJob.status) switch (printJob.status)