3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added missing notifications for Connect prints

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-12-22 13:48:51 +01:00
parent eb27695d52
commit 562b2454b8
1 changed files with 22 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py
View file

@ -67,6 +67,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
self.setShortDescription(i18n_catalog.i18nc("@action:button Preceded by 'Ready to'.", "Print over network")) self.setShortDescription(i18n_catalog.i18nc("@action:button Preceded by 'Ready to'.", "Print over network"))
self.setDescription(i18n_catalog.i18nc("@properties:tooltip", "Print over network")) self.setDescription(i18n_catalog.i18nc("@properties:tooltip", "Print over network"))
self._finished_jobs = []
@pyqtProperty(QObject, notify=activePrinterChanged) @pyqtProperty(QObject, notify=activePrinterChanged)
def controlItem(self): def controlItem(self):
if self._active_printer is None: if self._active_printer is None:
@ -216,6 +218,24 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
return (datetime_completed.strftime("%a %b ") + "{day}".format(day=datetime_completed.day)).upper() return (datetime_completed.strftime("%a %b ") + "{day}".format(day=datetime_completed.day)).upper()
def _printJobStateChanged(self):
username = self._getUserName()
if username is None:
# We only want to show notifications if username is set.
return
finished_jobs = [job for job in self._print_jobs if job.state == "wait_cleanup"]
newly_finished_jobs = [job for job in finished_jobs if job not in self._finished_jobs and job.owner == username]
for job in newly_finished_jobs:
job_completed_text = i18n_catalog.i18nc("@info:status", "Printer '{printer_name}' has finished printing '{job_name}'.".format(printer_name=job.assignedPrinter.name, job_name = job.name))
job_completed_message = Message(text=job_completed_text, title = i18n_catalog.i18nc("@info:status", "Print finished"))
job_completed_message.show()
# Keep a list of all completed jobs so we know if something changed next time.
self._finished_jobs = finished_jobs
def _update(self): def _update(self):
if not super()._update(): if not super()._update():
return return
@ -243,6 +263,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
print_job = PrintJobOutputModel(output_controller = ClusterUM3PrinterOutputController(self), print_job = PrintJobOutputModel(output_controller = ClusterUM3PrinterOutputController(self),
key = print_job_data["uuid"], key = print_job_data["uuid"],
name = print_job_data["name"]) name = print_job_data["name"])
print_job.stateChanged.connect(self._printJobStateChanged)
job_list_changed = True job_list_changed = True
self._print_jobs.append(print_job) self._print_jobs.append(print_job)
print_job.updateTimeTotal(print_job_data["time_total"]) print_job.updateTimeTotal(print_job_data["time_total"])
@ -267,6 +288,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
for removed_job in removed_jobs: for removed_job in removed_jobs:
if removed_job.assignedPrinter: if removed_job.assignedPrinter:
removed_job.assignedPrinter.updateActivePrintJob(None) removed_job.assignedPrinter.updateActivePrintJob(None)
removed_job.stateChanged.disconnect(self._printJobStateChanged)
self._print_jobs.remove(removed_job) self._print_jobs.remove(removed_job)
job_list_changed = True job_list_changed = True