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

Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-12-17 17:56:22 +01:00
commit 08458df873
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GCodeReader/FlavorParser.py
View File

@ -364,6 +364,8 @@ class FlavorParser:
self._layer_type = LayerPolygon.SupportType self._layer_type = LayerPolygon.SupportType
elif type == "FILL": elif type == "FILL":
self._layer_type = LayerPolygon.InfillType self._layer_type = LayerPolygon.InfillType
elif type == "SUPPORT-INTERFACE":
self._layer_type = LayerPolygon.SupportInterfaceType
else: else:
Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type) Logger.log("w", "Encountered a unknown type (%s) while parsing g-code.", type)

11
resources/qml/Settings/SettingView.qml
View File

@ -558,17 +558,6 @@ Item
onTriggered: Cura.Actions.configureSettingVisibility.trigger(contextMenu); onTriggered: Cura.Actions.configureSettingVisibility.trigger(contextMenu);
} }
MenuSeparator {}
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Collapse All")
onTriggered: definitionsModel.collapseAll()
}
MenuItem
{
text: catalog.i18nc("@action:inmenu", "Expand All")
onTriggered: definitionsModel.expandRecursive()
}
} }
UM.SettingPropertyProvider UM.SettingPropertyProvider

2
resources/themes/cura-dark/theme.json
View File

@ -40,6 +40,8 @@
"text_scene": [255, 255, 255, 162], "text_scene": [255, 255, 255, 162],
"text_scene_hover": [255, 255, 255, 204], "text_scene_hover": [255, 255, 255, 204],
"printer_type_label_background": [95, 95, 95, 255],
"error": [212, 31, 53, 255], "error": [212, 31, 53, 255],
"disabled": [32, 32, 32, 255], "disabled": [32, 32, 32, 255],