Merge branch '4.11'

This commit is contained in:
Ghostkeeper 2021-08-18 16:18:43 +02:00
commit 8650dd9b0f
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
13 changed files with 68 additions and 15 deletions

View file

@ -73,7 +73,6 @@ class DFFileExportAndUploadManager:
self._generic_success_message = getBackwardsCompatibleMessage(
text = "Your {} uploaded to '{}'.".format("file was" if len(self._file_upload_job_metadata) <= 1 else "files were", self._library_project_name),
title = "Upload successful",
lifetime = 0,
message_type_str = "POSITIVE"
)
self._generic_success_message.addAction(
@ -341,7 +340,6 @@ class DFFileExportAndUploadManager:
"file_upload_success_message": getBackwardsCompatibleMessage(
text = "'{}' was uploaded to '{}'.".format(filename_3mf, self._library_project_name),
title = "Upload successful",
lifetime = 0,
message_type_str = "POSITIVE"
),
"file_upload_failed_message": getBackwardsCompatibleMessage(
@ -365,7 +363,6 @@ class DFFileExportAndUploadManager:
"file_upload_success_message": getBackwardsCompatibleMessage(
text = "'{}' was uploaded to '{}'.".format(filename_ufp, self._library_project_name),
title = "Upload successful",
lifetime = 0,
message_type_str = "POSITIVE"
),
"file_upload_failed_message": getBackwardsCompatibleMessage(