mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-01 14:51:07 -07:00
Merge branch 'CL-508_correct_status_msg_when_disconnected' into 3.0
This commit is contained in:
commit
e6f613248c
1 changed files with 16 additions and 0 deletions
|
|
@ -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)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue