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

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

Browse Source
This commit is contained in:
fieldOfView 2016-07-11 17:26:19 +02:00
commit cd09017328
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Settings/ContainerManager.py
View File

@ -349,6 +349,10 @@ class ContainerManager(QObject):
def _updateContainerNameFilters(self): def _updateContainerNameFilters(self):
self._container_name_filters = {} self._container_name_filters = {}
for plugin_id, container_type in UM.Settings.ContainerRegistry.getContainerTypes(): for plugin_id, container_type in UM.Settings.ContainerRegistry.getContainerTypes():
# Ignore default container types since those are not plugins
if container_type in (UM.Settings.InstanceContainer, UM.Settings.ContainerStack, UM.Settings.DefinitionContainer):
continue
serialize_type = "" serialize_type = ""
try: try:
plugin_metadata = UM.PluginRegistry.getInstance().getMetaData(plugin_id) plugin_metadata = UM.PluginRegistry.getInstance().getMetaData(plugin_id)

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

@ -3077,7 +3077,8 @@
"label": "Infill Mesh Order", "label": "Infill Mesh Order",
"description": "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.", "description": "Determines which infill mesh is inside the infill of another infill mesh. An infill mesh with a higher order will modify the infill of infill meshes with lower order and normal meshes.",
"default_value": 0, "default_value": 0,
"minimum_value_warning": "0", "value": "1 if infill_mesh else 0",
"minimum_value_warning": "1",
"maximum_value_warning": "50", "maximum_value_warning": "50",
"type": "int", "type": "int",
"settable_per_mesh": true, "settable_per_mesh": true,

4
resources/qml/Preferences/MaterialsPage.qml
View File

@ -135,7 +135,7 @@ UM.ManagementPage
enabled: base.currentItem != null && !base.currentItem.readOnly enabled: base.currentItem != null && !base.currentItem.readOnly
checkable: true checkable: enabled
} }
} }
@ -150,7 +150,7 @@ UM.ManagementPage
bottom: parent.bottom bottom: parent.bottom
} }
editingEnabled: base.currentItem != null && !base.currentItem.readOnly && editButton.checked; editingEnabled: editButton.checkable && editButton.checked;
properties: materialProperties properties: materialProperties
containerId: base.currentItem != null ? base.currentItem.id : "" containerId: base.currentItem != null ? base.currentItem.id : ""