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

Merge branch 'CURA-8541_Aborted_state_not_reflected_correctly_in_Cura_Monitor_Page'

Browse Source
This commit is contained in:
Ghostkeeper 2021-11-23 16:28:46 +01:00
commit cecd033430
No known key found for this signature in database
GPG Key ID: D2A8871EE34EC59A
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml
View File

@ -73,10 +73,6 @@ Item
switch (printJob.state) switch (printJob.state)
{ {
case "wait_cleanup": case "wait_cleanup":
if (printJob.timeTotal > printJob.timeElapsed)
{
return catalog.i18nc("@label:status", "Aborted");
}
return catalog.i18nc("@label:status", "Finished"); return catalog.i18nc("@label:status", "Finished");
case "finished": case "finished":
return catalog.i18nc("@label:status", "Finished"); return catalog.i18nc("@label:status", "Finished");
@ -88,6 +84,20 @@ Item
return catalog.i18nc("@label:status", "Aborting..."); return catalog.i18nc("@label:status", "Aborting...");
case "aborted": // NOTE: Unused, see above case "aborted": // NOTE: Unused, see above
return catalog.i18nc("@label:status", "Aborted"); return catalog.i18nc("@label:status", "Aborted");
case "aborted_post_print":
return catalog.i18nc("@label:status", "Aborted");
case "aborted_wait_user_action":
return catalog.i18nc("@label:status", "Aborted");
case "aborted_wait_cleanup":
return catalog.i18nc("@label:status", "Aborted");
case "failed":
return catalog.i18nc("@label:status", "Failed");
case "failed_post_print":
return catalog.i18nc("@label:status", "Failed");
case "failed_wait_user_action":
return catalog.i18nc("@label:status", "Failed");
case "failed_wait_cleanup":
return catalog.i18nc("@label:status", "Failed");
case "pausing": case "pausing":
return catalog.i18nc("@label:status", "Pausing..."); return catalog.i18nc("@label:status", "Pausing...");
case "paused": case "paused":