From 228a3e821e3e9e295130904844f800fe287cc27f Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:06:26 +0200 Subject: [PATCH 1/8] Add Support Structure to Basic We show this setting in recommended, so it's safe to say we can show it in basic. --- resources/setting_visibility/basic.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 927989fee3..0193eb26ba 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -45,6 +45,7 @@ support_extruder_nr support_type support_angle support_offset +support_structure [platform_adhesion] prime_blob_enable From 8b8e96429339f7543c7cd0f50c710a3539b74258 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 21 Jul 2023 11:34:02 +0200 Subject: [PATCH 2/8] Fix wrong licenses These seem to be wrong by accident. Let's update them to reflect the rest of Cura which falls under the LGPLv3 or higher. --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 2 +- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 2 +- plugins/PostProcessingPlugin/Script.py | 2 +- plugins/PostProcessingPlugin/scripts/ChangeAtZ.py | 2 +- plugins/PostProcessingPlugin/scripts/ColorMix.py | 2 +- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 2 +- plugins/PostProcessingPlugin/scripts/RetractContinue.py | 2 +- plugins/PostProcessingPlugin/scripts/SearchAndReplace.py | 2 +- plugins/PostProcessingPlugin/scripts/Stretch.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index fbb4214021..b3ef761af5 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -1,5 +1,5 @@ # Copyright (c) 2018 Jaime van Kessel, Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. import configparser # The script lists are stored in metadata as serialised config files. import importlib.util diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index a80f304aaa..0f379479ba 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -1,5 +1,5 @@ // Copyright (c) 2022 Jaime van Kessel, Ultimaker B.V. -// The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +// The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 import QtQuick.Controls 2.15 diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py index 1cc9b59c9c..be661e0889 100644 --- a/plugins/PostProcessingPlugin/Script.py +++ b/plugins/PostProcessingPlugin/Script.py @@ -1,6 +1,6 @@ # Copyright (c) 2015 Jaime van Kessel # Copyright (c) 2018 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. from typing import Optional, Any, Dict, TYPE_CHECKING, List from UM.Signal import Signal, signalemitter diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 91b36389f3..2930623a93 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -1,7 +1,7 @@ # ChangeAtZ script - Change printing parameters at a given height # This script is the successor of the TweakAtZ plugin for legacy Cura. # It contains code from the TweakAtZ plugin V1.0-V4.x and from the ExampleScript by Jaime van Kessel, Ultimaker B.V. -# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms # Authors of the ChangeAtZ plugin / script: diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix.py b/plugins/PostProcessingPlugin/scripts/ColorMix.py index dacb40e905..534c0208cf 100644 --- a/plugins/PostProcessingPlugin/scripts/ColorMix.py +++ b/plugins/PostProcessingPlugin/scripts/ColorMix.py @@ -1,6 +1,6 @@ # ColorMix script - 2-1 extruder color mix and blending # This script is specific for the Geeetech A10M dual extruder but should work with other Marlin printers. -# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms #Authors of the 2-1 ColorMix plug-in / script: diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index d3c1e60192..93941c0992 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. # Modification 06.09.2020 # add checkbox, now you can choose and use configuration from the firmware itself. diff --git a/plugins/PostProcessingPlugin/scripts/RetractContinue.py b/plugins/PostProcessingPlugin/scripts/RetractContinue.py index b5ea4d4eda..eaa15e0942 100644 --- a/plugins/PostProcessingPlugin/scripts/RetractContinue.py +++ b/plugins/PostProcessingPlugin/scripts/RetractContinue.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 UltiMaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. from ..Script import Script diff --git a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py index 40a56ace57..7a12c229cc 100644 --- a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py +++ b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py @@ -1,5 +1,5 @@ # Copyright (c) 2017 Ghostkeeper -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. import re #To perform the search and replace. diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py index 8d35f68822..ab964d160a 100644 --- a/plugins/PostProcessingPlugin/scripts/Stretch.py +++ b/plugins/PostProcessingPlugin/scripts/Stretch.py @@ -1,4 +1,4 @@ -# This PostProcessingPlugin script is released under the terms of the AGPLv3 or higher. +# This PostProcessingPlugin script is released under the terms of the LGPLv3 or higher. """ Copyright (c) 2017 Christophe Baribaud 2017 Python implementation of https://github.com/electrocbd/post_stretch From 08748b1a336b4bb5a40e55b05bd6f4937621f7ac Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:53:36 +0200 Subject: [PATCH 3/8] Update description for Hole Horizontal expansion Clarify relation with Hole Horizontal Expansion and ole Horizontal Expansion Max Diameter --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 915a550a33..d1c532a32d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1289,7 +1289,7 @@ "hole_xy_offset": { "label": "Hole Horizontal Expansion", - "description": "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes.", + "description": "When greater than zero, the Hole Horizontal Expansion is the amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes. When this setting is enabled it can be further tuned with Hole Horizontal Expansion Max Diameter.", "unit": "mm", "type": "float", "minimum_value_warning": "-1", From 56b8205ce04c30ff954dba03ab453e64499d9a85 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sun, 23 Jul 2023 17:48:11 +0200 Subject: [PATCH 4/8] Revert "Fix wrong licenses" This reverts commit 8b8e96429339f7543c7cd0f50c710a3539b74258. --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 2 +- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 2 +- plugins/PostProcessingPlugin/Script.py | 2 +- plugins/PostProcessingPlugin/scripts/ChangeAtZ.py | 2 +- plugins/PostProcessingPlugin/scripts/ColorMix.py | 2 +- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 2 +- plugins/PostProcessingPlugin/scripts/RetractContinue.py | 2 +- plugins/PostProcessingPlugin/scripts/SearchAndReplace.py | 2 +- plugins/PostProcessingPlugin/scripts/Stretch.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index b3ef761af5..fbb4214021 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -1,5 +1,5 @@ # Copyright (c) 2018 Jaime van Kessel, Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import configparser # The script lists are stored in metadata as serialised config files. import importlib.util diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 0f379479ba..a80f304aaa 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -1,5 +1,5 @@ // Copyright (c) 2022 Jaime van Kessel, Ultimaker B.V. -// The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +// The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import QtQuick 2.2 import QtQuick.Controls 2.15 diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py index be661e0889..1cc9b59c9c 100644 --- a/plugins/PostProcessingPlugin/Script.py +++ b/plugins/PostProcessingPlugin/Script.py @@ -1,6 +1,6 @@ # Copyright (c) 2015 Jaime van Kessel # Copyright (c) 2018 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from typing import Optional, Any, Dict, TYPE_CHECKING, List from UM.Signal import Signal, signalemitter diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 2930623a93..91b36389f3 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -1,7 +1,7 @@ # ChangeAtZ script - Change printing parameters at a given height # This script is the successor of the TweakAtZ plugin for legacy Cura. # It contains code from the TweakAtZ plugin V1.0-V4.x and from the ExampleScript by Jaime van Kessel, Ultimaker B.V. -# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms # Authors of the ChangeAtZ plugin / script: diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix.py b/plugins/PostProcessingPlugin/scripts/ColorMix.py index 534c0208cf..dacb40e905 100644 --- a/plugins/PostProcessingPlugin/scripts/ColorMix.py +++ b/plugins/PostProcessingPlugin/scripts/ColorMix.py @@ -1,6 +1,6 @@ # ColorMix script - 2-1 extruder color mix and blending # This script is specific for the Geeetech A10M dual extruder but should work with other Marlin printers. -# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms #Authors of the 2-1 ColorMix plug-in / script: diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 93941c0992..d3c1e60192 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. # Modification 06.09.2020 # add checkbox, now you can choose and use configuration from the firmware itself. diff --git a/plugins/PostProcessingPlugin/scripts/RetractContinue.py b/plugins/PostProcessingPlugin/scripts/RetractContinue.py index eaa15e0942..b5ea4d4eda 100644 --- a/plugins/PostProcessingPlugin/scripts/RetractContinue.py +++ b/plugins/PostProcessingPlugin/scripts/RetractContinue.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 UltiMaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from ..Script import Script diff --git a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py index 7a12c229cc..40a56ace57 100644 --- a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py +++ b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py @@ -1,5 +1,5 @@ # Copyright (c) 2017 Ghostkeeper -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import re #To perform the search and replace. diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py index ab964d160a..8d35f68822 100644 --- a/plugins/PostProcessingPlugin/scripts/Stretch.py +++ b/plugins/PostProcessingPlugin/scripts/Stretch.py @@ -1,4 +1,4 @@ -# This PostProcessingPlugin script is released under the terms of the LGPLv3 or higher. +# This PostProcessingPlugin script is released under the terms of the AGPLv3 or higher. """ Copyright (c) 2017 Christophe Baribaud 2017 Python implementation of https://github.com/electrocbd/post_stretch From afc0f7c615a7b819c331d8a596d76831489c3b43 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 25 Jul 2023 13:11:43 +0200 Subject: [PATCH 5/8] Update to add sort_by option Added a class attribute "last_updated" for sort_by Added an instance attribute for search_sort Added if statement to add the sort_by string, currently by default. --- plugins/Marketplace/RemotePackageList.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index d06d2c64c5..a4c453e25d 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -21,6 +21,7 @@ catalog = i18nCatalog("cura") class RemotePackageList(PackageList): ITEMS_PER_PAGE = 20 # Pagination of number of elements to download at once. + LAST_UPDATED = "last_updated" # Default value to send for sort_by filter. def __init__(self, parent: Optional["QObject"] = None) -> None: super().__init__(parent) @@ -28,6 +29,7 @@ class RemotePackageList(PackageList): self._package_type_filter = "" self._requested_search_string = "" self._current_search_string = "" + self._search_sort = "sort_by" self._search_type = "search" self._request_url = self._initialRequestUrl() self._ongoing_requests["get_packages"] = None @@ -102,6 +104,8 @@ class RemotePackageList(PackageList): request_url += f"&package_type={self._package_type_filter}" if self._current_search_string != "": request_url += f"&{self._search_type}={self._current_search_string}" + if self._search_sort != "": + request_url += f"&{self._search_sort}={self.LAST_UPDATED}" return request_url def _parseResponse(self, reply: "QNetworkReply") -> None: From 8c54d44cbb61e80f138fc8de4a708a1b0f432625 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 25 Jul 2023 13:27:08 +0200 Subject: [PATCH 6/8] Apply suggestions from code review --- plugins/Marketplace/RemotePackageList.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index a4c453e25d..78f24a72a1 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -21,7 +21,7 @@ catalog = i18nCatalog("cura") class RemotePackageList(PackageList): ITEMS_PER_PAGE = 20 # Pagination of number of elements to download at once. - LAST_UPDATED = "last_updated" # Default value to send for sort_by filter. + SORT_TYPE = "last_updated" # Default value to send for sort_by filter. def __init__(self, parent: Optional["QObject"] = None) -> None: super().__init__(parent) @@ -105,7 +105,7 @@ class RemotePackageList(PackageList): if self._current_search_string != "": request_url += f"&{self._search_type}={self._current_search_string}" if self._search_sort != "": - request_url += f"&{self._search_sort}={self.LAST_UPDATED}" + request_url += f"&{self._search_sort}={self.SORT_TYPE}" return request_url def _parseResponse(self, reply: "QNetworkReply") -> None: From 7e2fc1ac5b03d2b2d1f7b55314acc5f018cdc289 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 25 Jul 2023 13:29:22 +0200 Subject: [PATCH 7/8] Update plugins/Marketplace/RemotePackageList.py --- plugins/Marketplace/RemotePackageList.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index 78f24a72a1..f8826ff395 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -104,7 +104,7 @@ class RemotePackageList(PackageList): request_url += f"&package_type={self._package_type_filter}" if self._current_search_string != "": request_url += f"&{self._search_type}={self._current_search_string}" - if self._search_sort != "": + if self.SORT_TYPE: request_url += f"&{self._search_sort}={self.SORT_TYPE}" return request_url From 23d79de4b982e05952138e425bb62f6ea22af1ab Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 25 Jul 2023 13:34:29 +0200 Subject: [PATCH 8/8] Make show custom button more visible in darkmode CURA-10782 --- .../qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 50b5dc7357..0f4efc8498 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -111,7 +111,6 @@ Flickable anchors.right: parent.right text: catalog.i18nc("@button", "Show Custom") textFont: UM.Theme.getFont("medium_bold") - outlineColor: "transparent" onClicked: onModeChanged() } }