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

Swap text and title for message.

Browse source 
Move link opening code into the PrintJobAwaitingApprovalMessage.py

CURA-9221
This commit is contained in:
joeydelarago 2022-08-24 17:02:17 +02:00
parent 9b20a1b37f
commit 1a023f7285
3 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
View file

@ -16,6 +16,7 @@ from cura.CuraApplication import CuraApplication
from cura.UltimakerCloud import UltimakerCloudConstants
from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope
from .ToolPathUploader import ToolPathUploader
from ..Messages.PrintJobAwaitingApprovalMessage import PrintJobPendingApprovalMessage
from ..Models.BaseModel import BaseModel
from ..Models.Http.CloudClusterResponse import CloudClusterResponse
from ..Models.Http.CloudClusterStatus import CloudClusterStatus
@ -241,6 +242,8 @@ class CloudApiClient:
status_code, response = self._parseReply(reply)
if status_code >= 300 and on_error is not None:
on_error()
elif "data" in response and "status" in response["data"] and response["data"]["status"] == "wait_approval":
PrintJobPendingApprovalMessage().show()
else:
self._parseModels(response, on_finished, model)

6
plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py
View file

@ -3,7 +3,7 @@
from time import time
import os
from typing import cast, List, Optional, TYPE_CHECKING
from typing import cast, List, Optional
from PyQt6.QtCore import QObject, QUrl, pyqtProperty, pyqtSignal, pyqtSlot
from PyQt6.QtGui import QDesktopServices
@ -21,7 +21,6 @@ from cura.PrinterOutput.PrinterOutputDevice import ConnectionType
from .CloudApiClient import CloudApiClient
from ..ExportFileJob import ExportFileJob
from ..Messages.PrintJobAwaitingApprovalMessage import PrintJobPendingApprovalMessage
from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice
from ..Messages.PrintJobUploadBlockedMessage import PrintJobUploadBlockedMessage
from ..Messages.PrintJobUploadErrorMessage import PrintJobUploadErrorMessage
@ -232,9 +231,6 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
:param job_response: The response received from the cloud API.
"""
if job_response.status is "wait_approval":
PrintJobPendingApprovalMessage().show()
if not self._tool_path:
return self._onUploadError()
self._pre_upload_print_job = job_response # store the last uploaded job to prevent re-upload of the same file

26
plugins/UM3NetworkPrinting/src/Messages/PrintJobAwaitingApprovalMessage.py
View file

@ -1,5 +1,8 @@
# Copyright (c) 2022 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from PyQt6.QtCore import QUrl
from PyQt6.QtGui import QDesktopServices
from UM import i18nCatalog
from UM.Message import Message
@ -12,14 +15,19 @@ class PrintJobPendingApprovalMessage(Message):
def __init__(self) -> None:
super().__init__(
text = I18N_CATALOG.i18nc("@info:status", "The print job was succesfully submitted"),
title=I18N_CATALOG.i18nc("@info:title", "You will recieve a confirmation via email when the print job is approved"),
text = I18N_CATALOG.i18nc("@info:status", "You will receive a confirmation via email when the print job is approved"),
title=I18N_CATALOG.i18nc("@info:title", "The print job was successfully submitted"),
message_type=Message.MessageType.POSITIVE
)
self.self.addAction("learn_more",
I18N_CATALOG.i18nc("@action", "Learn more"),
"",
"",
"",
button_style = Message.ActionButtonStyle.LINK,
button_align = Message.ActionButtonAlignment.ALIGN_LEFT)
self.addAction("manage_print_jobs", I18N_CATALOG.i18nc("@action", "Manage print jobs"), "", "")
self.addAction("learn_more", I18N_CATALOG.i18nc("@action", "Learn more"), "", "",
button_style = Message.ActionButtonStyle.LINK,
button_align = Message.ActionButtonAlignment.ALIGN_LEFT)
self.actionTriggered.connect(self._onActionTriggered)
def _onActionTriggered(self, message: Message, action: str):
""" Callback function for the "Manage print jobs" button on the pending approval notification. """
if action == "manage_print_jobs":
QDesktopServices.openUrl(QUrl("https://ultimaker.com/"))