Merge branch 'CL-508_correct_status_msg_when_disconnected' into 3.0

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

View file

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