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

CL-228 CL-229 better fallback to printer status labels

Browse Source
This commit is contained in:
Jack Ha 2017-10-02 16:02:59 +02:00
parent 6d861c8a33
commit 341b2b3718
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
plugins/UM3NetworkPrinting/PrinterInfoBlock.qml
View File

@ -37,6 +37,23 @@ Rectangle
return Math.min(100, Math.round(printJob.time_elapsed / printJob.time_total * 100)) + "%"; return Math.min(100, Math.round(printJob.time_elapsed / printJob.time_total * 100)) + "%";
} }
function printerStatusText(printer)
{
switch (printer.status)
{
case "pre_print":
return catalog.i18nc("@label", "Preparing to print")
case "printing":
return catalog.i18nc("@label:status", "Printing");
case "idle":
return catalog.i18nc("@label:status", "Available");
case "unreachable": // TODO: new string
case "maintenance": // TODO: new string
case "unknown":
default:
return catalog.i18nc("@label", "Unknown");
}
}
id: printerDelegate id: printerDelegate
property var printer property var printer
@ -232,7 +249,7 @@ Rectangle
return catalog.i18nc("@label:status", "Disabled"); return catalog.i18nc("@label:status", "Disabled");
} }
if(printJob != null) if ((printJob != null) && ((printer.status === "pre_print") || (printer.status === "printing")))
{ {
switch (printJob.status) switch (printJob.status)
{ {
@ -263,23 +280,10 @@ Rectangle
case "aborted": case "aborted":
return catalog.i18nc("@label:status", "Print aborted"); return catalog.i18nc("@label:status", "Print aborted");
default: default:
return ""; return printerStatusText(printer);
} }
} }
switch (printer.status) return printerStatusText(printer);
{
case "pre_print":
return catalog.i18nc("@label", "Preparing to print")
case "printing":
return catalog.i18nc("@label:status", "Printing");
case "idle":
return catalog.i18nc("@label:status", "Available");
case "unreachable": // TODO: new string
case "maintenance": // TODO: new string
case "unknown":
default:
return catalog.i18nc("@label", "Unknown");
}
} }
elide: Text.ElideRight elide: Text.ElideRight