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

Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11

Browse Source
This commit is contained in:
fvrmr 2021-08-18 17:28:03 +02:00
commit 090a793e8a
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/DigitalLibrary/src/BackwardsCompatibleMessage.py
View File

@ -1,11 +1,13 @@
# Copyright (c) 2021 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from typing import Optional
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from UM.Message import Message from UM.Message import Message
from UM.Version import Version from UM.Version import Version
def getBackwardsCompatibleMessage(text: str, title: str, lifetime: int, message_type_str: str) -> Message:
def getBackwardsCompatibleMessage(text: str, title: str, message_type_str: str, lifetime: Optional[int] = 30) -> Message:
if CuraApplication.getInstance().getAPIVersion() < Version("7.7.0"): if CuraApplication.getInstance().getAPIVersion() < Version("7.7.0"):
return Message(text=text, title=title, lifetime=lifetime) return Message(text=text, title=title, lifetime=lifetime)
else: else:

24
plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py
View File

@ -220,8 +220,8 @@ class DFFileExportAndUploadManager:
self._file_upload_job_metadata[filename]["file_upload_failed_message"] = getBackwardsCompatibleMessage( self._file_upload_job_metadata[filename]["file_upload_failed_message"] = getBackwardsCompatibleMessage(
text = "Failed to export the file '{}'. The upload process is aborted.".format(filename), text = "Failed to export the file '{}'. The upload process is aborted.".format(filename),
title = "Export error", title = "Export error",
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR" lifetime = 0
) )
self._on_upload_error() self._on_upload_error()
self._onFileUploadFinished(filename) self._onFileUploadFinished(filename)
@ -243,8 +243,8 @@ class DFFileExportAndUploadManager:
self._file_upload_job_metadata[filename_3mf]["file_upload_failed_message"] = getBackwardsCompatibleMessage( self._file_upload_job_metadata[filename_3mf]["file_upload_failed_message"] = getBackwardsCompatibleMessage(
text = "Failed to upload the file '{}' to '{}'. {}".format(filename_3mf, self._library_project_name, human_readable_error), text = "Failed to upload the file '{}' to '{}'. {}".format(filename_3mf, self._library_project_name, human_readable_error),
title = "File upload error", title = "File upload error",
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR" lifetime = 0
) )
self._on_upload_error() self._on_upload_error()
self._onFileUploadFinished(filename_3mf) self._onFileUploadFinished(filename_3mf)
@ -266,8 +266,8 @@ class DFFileExportAndUploadManager:
self._file_upload_job_metadata[filename_ufp]["file_upload_failed_message"] = getBackwardsCompatibleMessage( self._file_upload_job_metadata[filename_ufp]["file_upload_failed_message"] = getBackwardsCompatibleMessage(
title = "File upload error", title = "File upload error",
text = "Failed to upload the file '{}' to '{}'. {}".format(filename_ufp, self._library_project_name, human_readable_error), text = "Failed to upload the file '{}' to '{}'. {}".format(filename_ufp, self._library_project_name, human_readable_error),
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR" lifetime = 0
) )
self._on_upload_error() self._on_upload_error()
self._onFileUploadFinished(filename_ufp) self._onFileUploadFinished(filename_ufp)
@ -303,8 +303,8 @@ class DFFileExportAndUploadManager:
self._file_upload_job_metadata[filename]["file_upload_failed_message"] = getBackwardsCompatibleMessage( self._file_upload_job_metadata[filename]["file_upload_failed_message"] = getBackwardsCompatibleMessage(
title = "File upload error", title = "File upload error",
text = "Failed to upload the file '{}' to '{}'. {}".format(self._file_name, self._library_project_name, human_readable_error), text = "Failed to upload the file '{}' to '{}'. {}".format(self._file_name, self._library_project_name, human_readable_error),
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR" lifetime = 0
) )
self._on_upload_error() self._on_upload_error()
@ -345,8 +345,8 @@ class DFFileExportAndUploadManager:
"file_upload_failed_message": getBackwardsCompatibleMessage( "file_upload_failed_message": getBackwardsCompatibleMessage(
text = "Failed to upload the file '{}' to '{}'.".format(filename_3mf, self._library_project_name), text = "Failed to upload the file '{}' to '{}'.".format(filename_3mf, self._library_project_name),
title = "File upload error", title = "File upload error",
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR" lifetime = 0
) )
} }
job_3mf = ExportFileJob(self._file_handlers["3mf"], self._nodes, self._file_name, "3mf") job_3mf = ExportFileJob(self._file_handlers["3mf"], self._nodes, self._file_name, "3mf")
@ -368,8 +368,8 @@ class DFFileExportAndUploadManager:
"file_upload_failed_message": getBackwardsCompatibleMessage( "file_upload_failed_message": getBackwardsCompatibleMessage(
text = "Failed to upload the file '{}' to '{}'.".format(filename_ufp, self._library_project_name), text = "Failed to upload the file '{}' to '{}'.".format(filename_ufp, self._library_project_name),
title = "File upload error", title = "File upload error",
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR" lifetime = 0
) )
} }
job_ufp = ExportFileJob(self._file_handlers["ufp"], self._nodes, self._file_name, "ufp") job_ufp = ExportFileJob(self._file_handlers["ufp"], self._nodes, self._file_name, "ufp")

16
plugins/DigitalLibrary/src/DigitalFactoryController.py
View File

@ -531,8 +531,8 @@ class DigitalFactoryController(QObject):
getBackwardsCompatibleMessage( getBackwardsCompatibleMessage(
text = "Failed to write to temporary file for '{}'.".format(file_name), text = "Failed to write to temporary file for '{}'.".format(file_name),
title = "File-system error", title = "File-system error",
lifetime = 10, message_type_str="ERROR",
message_type_str="ERROR" lifetime = 10
).show() ).show()
return return
@ -546,8 +546,8 @@ class DigitalFactoryController(QObject):
getBackwardsCompatibleMessage( getBackwardsCompatibleMessage(
text = "Failed Digital Library download for '{}'.".format(f), text = "Failed Digital Library download for '{}'.".format(f),
title = "Network error {}".format(error), title = "Network error {}".format(error),
lifetime = 10, message_type_str="ERROR",
message_type_str="ERROR" lifetime = 10
).show() ).show()
download_manager = HttpRequestManager.getInstance() download_manager = HttpRequestManager.getInstance()
@ -592,10 +592,12 @@ class DigitalFactoryController(QObject):
if filename == "": if filename == "":
Logger.log("w", "The file name cannot be empty.") Logger.log("w", "The file name cannot be empty.")
getBackwardsCompatibleMessage(text = "Cannot upload file with an empty name to the Digital Library", getBackwardsCompatibleMessage(
text = "Cannot upload file with an empty name to the Digital Library",
title = "Empty file name provided", title = "Empty file name provided",
lifetime = 0, message_type_str = "ERROR",
message_type_str = "ERROR").show() lifetime = 0
).show()
return return
self._saveFileToSelectedProjectHelper(filename, formats) self._saveFileToSelectedProjectHelper(filename, formats)