From 67a4ec2a9e56ba6df31fa06efe49a69aa1b2d20f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 22 Jun 2017 18:56:55 +0200 Subject: [PATCH 1/2] dark layer view --- resources/themes/cura-dark/theme.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 559671dfeb..23cc30579e 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -181,6 +181,19 @@ "convex_hull": [35, 35, 35, 127], "disallowed_area": [0, 0, 0, 40], - "error_area": [255, 0, 0, 127] + "error_area": [255, 0, 0, 127], + + "layerview_ghost": [32, 32, 32, 96], + "layerview_none": [255, 255, 255, 255], + "layerview_inset_0": [155, 0, 0, 255], + "layerview_inset_x": [0, 155, 0, 255], + "layerview_skin": [155, 155, 0, 255], + "layerview_support": [0, 155, 155, 255], + "layerview_skirt": [0, 155, 155, 255], + "layerview_infill": [155, 117, 0, 255], + "layerview_support_infill": [0, 155, 155, 255], + "layerview_move_combing": [0, 0, 155, 255], + "layerview_move_retraction": [77, 77, 155, 255], + "layerview_support_interface": [39, 117, 155, 255] } } From 13c9519a7c7cec619b4d36275193f706bfb37e8c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 23 Jun 2017 09:42:08 +0200 Subject: [PATCH 2/2] Fix deprecated decorator Contributes to issue CURA-2822. --- cura/Settings/MachineManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index a150e94e76..8aa060896a 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1122,7 +1122,7 @@ class MachineManager(QObject): def createMachineManager(engine=None, script_engine=None): return MachineManager() - @deprecated #Use ExtruderStack.material = ... and it won't be necessary. + @deprecated("Use ExtruderStack.material = ... and it won't be necessary", "2.7") def _updateMaterialContainer(self, definition: "DefinitionContainer", stack: "ContainerStack", variant_container: Optional["InstanceContainer"] = None, preferred_material_name: Optional[str] = None): if not definition.getMetaDataEntry("has_materials"): return self._empty_material_container