GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 15:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into CURA-10475_engineplugin

Browse Source
This commit is contained in:
c.lamboo 2023-07-26 16:58:20 +02:00
commit c15a53d349
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Marketplace/RemotePackageList.py
View File

@ -21,6 +21,7 @@ catalog = i18nCatalog("cura")
class RemotePackageList(PackageList): class RemotePackageList(PackageList):
ITEMS_PER_PAGE = 20 # Pagination of number of elements to download at once. ITEMS_PER_PAGE = 20 # Pagination of number of elements to download at once.
SORT_TYPE = "last_updated" # Default value to send for sort_by filter.
def __init__(self, parent: Optional["QObject"] = None) -> None: def __init__(self, parent: Optional["QObject"] = None) -> None:
super().__init__(parent) super().__init__(parent)
@ -28,6 +29,7 @@ class RemotePackageList(PackageList):
self._package_type_filter = "" self._package_type_filter = ""
self._requested_search_string = "" self._requested_search_string = ""
self._current_search_string = "" self._current_search_string = ""
self._search_sort = "sort_by"
self._search_type = "search" self._search_type = "search"
self._request_url = self._initialRequestUrl() self._request_url = self._initialRequestUrl()
self._ongoing_requests["get_packages"] = None self._ongoing_requests["get_packages"] = None
@ -102,6 +104,8 @@ class RemotePackageList(PackageList):
request_url += f"&package_type={self._package_type_filter}" request_url += f"&package_type={self._package_type_filter}"
if self._current_search_string != "": if self._current_search_string != "":
request_url += f"&{self._search_type}={self._current_search_string}" request_url += f"&{self._search_type}={self._current_search_string}"
if self.SORT_TYPE:
request_url += f"&{self._search_sort}={self.SORT_TYPE}"
return request_url return request_url
def _parseResponse(self, reply: "QNetworkReply") -> None: def _parseResponse(self, reply: "QNetworkReply") -> None:

2
resources/definitions/fdmprinter.def.json
View File

@ -1289,7 +1289,7 @@
"hole_xy_offset": "hole_xy_offset":
{ {
"label": "Hole Horizontal Expansion", "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", "unit": "mm",
"type": "float", "type": "float",
"minimum_value_warning": "-1", "minimum_value_warning": "-1",

1
resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
View File

@ -111,7 +111,6 @@ Flickable
anchors.right: parent.right anchors.right: parent.right
text: catalog.i18nc("@button", "Show Custom") text: catalog.i18nc("@button", "Show Custom")
textFont: UM.Theme.getFont("medium_bold") textFont: UM.Theme.getFont("medium_bold")
outlineColor: "transparent"
onClicked: onModeChanged() onClicked: onModeChanged()
} }
} }

1
resources/setting_visibility/basic.cfg
View File

@ -45,6 +45,7 @@ support_extruder_nr
support_type support_type
support_angle support_angle
support_offset support_offset
support_structure
[platform_adhesion] [platform_adhesion]
prime_blob_enable prime_blob_enable