mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-18 12:17:50 -06:00
Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection
This commit is contained in:
commit
f04db63594
4 changed files with 6 additions and 20 deletions
|
@ -1,10 +1,11 @@
|
|||
# Copyright (c) 2018 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
from UM.OutputDevice.OutputDevice import OutputDevice
|
||||
from cura.PrinterOutput.PrinterOutputController import PrinterOutputController
|
||||
|
||||
|
||||
class CloudOutputController(PrinterOutputController):
|
||||
def __init__(self, output_device):
|
||||
def __init__(self, output_device: OutputDevice):
|
||||
super().__init__(output_device)
|
||||
|
||||
# The cloud connection only supports fetching the printer and queue status and adding a job to the queue.
|
||||
|
|
|
@ -323,8 +323,7 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice):
|
|||
Message(
|
||||
text = message,
|
||||
title = T.ERROR,
|
||||
lifetime = 10,
|
||||
dismissable = True
|
||||
lifetime = 10
|
||||
).show()
|
||||
self._sending_job = False # the upload has finished so we're not sending a job anymore
|
||||
self.writeError.emit()
|
||||
|
@ -337,8 +336,7 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice):
|
|||
Message(
|
||||
text = T.UPLOAD_SUCCESS_TEXT,
|
||||
title = T.UPLOAD_SUCCESS_TITLE,
|
||||
lifetime = 5,
|
||||
dismissable = True,
|
||||
lifetime = 5
|
||||
).show()
|
||||
self._sending_job = False # the upload has finished so we're not sending a job anymore
|
||||
self.writeFinished.emit()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue