From 1d00f959c42542093731622a143bd06ddbacde4b Mon Sep 17 00:00:00 2001 From: fvrmr <77000924+fvrmr@users.noreply.github.com> Date: Wed, 18 Aug 2021 17:18:07 +0200 Subject: [PATCH 1/2] Update whats new pages Updated the links in the whats new pages --- resources/texts/whats_new/0.html | 2 +- resources/texts/whats_new/1.html | 4 ++-- resources/texts/whats_new/3.html | 2 +- resources/texts/whats_new/4.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/texts/whats_new/0.html b/resources/texts/whats_new/0.html index ab3514c81b..11e54ea831 100644 --- a/resources/texts/whats_new/0.html +++ b/resources/texts/whats_new/0.html @@ -1,3 +1,3 @@

Complete UI refresh

Look around and you will notice that we have refreshed over 100 icons throughout Ultimaker Cura. The new icons are designed for clarity – resulting in a simpler and more informative slicing experience. Also, when scaling the Ultimaker Cura window, the UI will adapt, resulting in less visual clutter.
-Learn more

\ No newline at end of file +Learn more

\ No newline at end of file diff --git a/resources/texts/whats_new/1.html b/resources/texts/whats_new/1.html index 0a8e51dbe7..c43c8a4c1b 100644 --- a/resources/texts/whats_new/1.html +++ b/resources/texts/whats_new/1.html @@ -1,3 +1,3 @@

Improved digital library integration

-

Collaborative workflows using the Digital Library are now simpler. Every user with a cloud-connected Ultimaker 3D printer can access stored projects. And we have added a “Search” function to make finding files easier. Learn more
-Ready to get more out of your Ultimaker 3D Printer? Upgrade to Ultimaker Essentials

\ No newline at end of file +

Collaborative workflows using the Digital Library are now simpler. Every user with a cloud-connected Ultimaker 3D printer can access stored projects. And we have added a “Search” function to make finding files easier. Learn more
+Ready to get more out of your Ultimaker 3D Printer? Upgrade to Ultimaker Essentials

\ No newline at end of file diff --git a/resources/texts/whats_new/3.html b/resources/texts/whats_new/3.html index 2a608721b4..d06a1c0d31 100644 --- a/resources/texts/whats_new/3.html +++ b/resources/texts/whats_new/3.html @@ -1,2 +1,2 @@

Learn about the past and future of Ultimaker Cura

-

How did Ultimaker Cura start? What does its future hold? Hear the origin stories and discover what's next, by listening to the core developers and community featured in episode 29 and episode 30 of the Talking Additive podcast.

\ No newline at end of file +

How did Ultimaker Cura start? What does its future hold? Hear the origin stories and discover what's next, by listening to the core developers and community featured in episode 29 and episode 30 of the Talking Additive podcast.

\ No newline at end of file diff --git a/resources/texts/whats_new/4.html b/resources/texts/whats_new/4.html index 587ae61cfb..b432babf7b 100644 --- a/resources/texts/whats_new/4.html +++ b/resources/texts/whats_new/4.html @@ -1,2 +1,2 @@

Get more information

-

Want more information on new features, bug fixes, and more for Ultimaker Cura 4.11 beta? Read the fullblog post and don't forget to give us your feedback onGithub!

\ No newline at end of file +

Want more information on new features, bug fixes, and more for Ultimaker Cura 4.11 beta? Read the fullblog post and don't forget to give us your feedback onGithub!

\ No newline at end of file From 9f31e1421b1551cf318169293bb0a0a7c529b55a Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Wed, 18 Aug 2021 17:18:21 +0200 Subject: [PATCH 2/2] Make lifetime optional in the getBackwardsCompatibleMessage This should fix the failing tests --- .../src/BackwardsCompatibleMessage.py | 4 +++- .../src/DFFileExportAndUploadManager.py | 24 +++++++++---------- .../src/DigitalFactoryController.py | 16 +++++++------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/plugins/DigitalLibrary/src/BackwardsCompatibleMessage.py b/plugins/DigitalLibrary/src/BackwardsCompatibleMessage.py index 420de45f34..7dd9f25ba0 100644 --- a/plugins/DigitalLibrary/src/BackwardsCompatibleMessage.py +++ b/plugins/DigitalLibrary/src/BackwardsCompatibleMessage.py @@ -1,11 +1,13 @@ # Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional from cura.CuraApplication import CuraApplication from UM.Message import Message 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"): return Message(text=text, title=title, lifetime=lifetime) else: diff --git a/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py b/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py index fd6f9cba04..ac753f47bf 100644 --- a/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py +++ b/plugins/DigitalLibrary/src/DFFileExportAndUploadManager.py @@ -220,8 +220,8 @@ class DFFileExportAndUploadManager: self._file_upload_job_metadata[filename]["file_upload_failed_message"] = getBackwardsCompatibleMessage( text = "Failed to export the file '{}'. The upload process is aborted.".format(filename), title = "Export error", - lifetime = 0, - message_type_str = "ERROR" + message_type_str = "ERROR", + lifetime = 0 ) self._on_upload_error() self._onFileUploadFinished(filename) @@ -243,8 +243,8 @@ class DFFileExportAndUploadManager: 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), title = "File upload error", - lifetime = 0, - message_type_str = "ERROR" + message_type_str = "ERROR", + lifetime = 0 ) self._on_upload_error() self._onFileUploadFinished(filename_3mf) @@ -266,8 +266,8 @@ class DFFileExportAndUploadManager: self._file_upload_job_metadata[filename_ufp]["file_upload_failed_message"] = getBackwardsCompatibleMessage( title = "File upload 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._onFileUploadFinished(filename_ufp) @@ -303,8 +303,8 @@ class DFFileExportAndUploadManager: self._file_upload_job_metadata[filename]["file_upload_failed_message"] = getBackwardsCompatibleMessage( title = "File upload 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() @@ -345,8 +345,8 @@ class DFFileExportAndUploadManager: "file_upload_failed_message": getBackwardsCompatibleMessage( text = "Failed to upload the file '{}' to '{}'.".format(filename_3mf, self._library_project_name), 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") @@ -368,8 +368,8 @@ class DFFileExportAndUploadManager: "file_upload_failed_message": getBackwardsCompatibleMessage( text = "Failed to upload the file '{}' to '{}'.".format(filename_ufp, self._library_project_name), 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") diff --git a/plugins/DigitalLibrary/src/DigitalFactoryController.py b/plugins/DigitalLibrary/src/DigitalFactoryController.py index dbb034379d..b94f0e69c8 100644 --- a/plugins/DigitalLibrary/src/DigitalFactoryController.py +++ b/plugins/DigitalLibrary/src/DigitalFactoryController.py @@ -531,8 +531,8 @@ class DigitalFactoryController(QObject): getBackwardsCompatibleMessage( text = "Failed to write to temporary file for '{}'.".format(file_name), title = "File-system error", - lifetime = 10, - message_type_str="ERROR" + message_type_str="ERROR", + lifetime = 10 ).show() return @@ -546,8 +546,8 @@ class DigitalFactoryController(QObject): getBackwardsCompatibleMessage( text = "Failed Digital Library download for '{}'.".format(f), title = "Network error {}".format(error), - lifetime = 10, - message_type_str="ERROR" + message_type_str="ERROR", + lifetime = 10 ).show() download_manager = HttpRequestManager.getInstance() @@ -592,10 +592,12 @@ class DigitalFactoryController(QObject): if filename == "": 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", - lifetime = 0, - message_type_str = "ERROR").show() + message_type_str = "ERROR", + lifetime = 0 + ).show() return self._saveFileToSelectedProjectHelper(filename, formats)