Merge branch '4.8'

This commit is contained in:
Ghostkeeper 2020-10-20 15:28:12 +02:00
commit c9fdf5954a
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A

View File

@ -359,6 +359,10 @@ Item
{
return catalog.i18nc("@label:status", "Idle")
}
if (!printer.activePrintJob && printer.state == "pre_print")
{
return catalog.i18nc("@label:status", "Preparing...")
}
if (!printer.activePrintJob && printer.state == "printing")
{
// The print job isn't quite updated yet.