From 58d998af683a4e9087d2aa090719fe8ae0d9e890 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 6 Feb 2019 11:58:22 +0100 Subject: [PATCH 1/5] Add theme entry for message image Contributes to CL-1222 --- resources/themes/cura-light/theme.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 34ca84ea6f..573fe8bcfa 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -562,6 +562,7 @@ "message_close": [1, 1], "message_radius": [0.25, 0.25], "message_action_button": [0, 2.0], + "message_image": [15.0, 5.0], "infill_button_margin": [0.5, 0.5], From c7c57c167c802488336bfffa7631b55b6897a255 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 6 Feb 2019 12:37:30 +0100 Subject: [PATCH 2/5] Fix call to non-existing function --- resources/qml/Menus/SettingsMenu.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Menus/SettingsMenu.qml b/resources/qml/Menus/SettingsMenu.qml index 4ea3a4d71a..03367a47e4 100644 --- a/resources/qml/Menus/SettingsMenu.qml +++ b/resources/qml/Menus/SettingsMenu.qml @@ -33,7 +33,7 @@ Menu MenuItem { text: catalog.i18nc("@action:inmenu", "Set as Active Extruder") - onTriggered: Cura.MachineManager.setExtruderIndex(model.index) + onTriggered: Cura.ExtruderManager.setActiveExtruderIndex(model.index) } MenuItem From 3a9474566700e0b16e4f70114e9ae323e9ea1a1d Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Feb 2019 16:01:01 +0100 Subject: [PATCH 3/5] Make sliders reappear in simulation-view. [CURA-6183] --- plugins/PreviewStage/PreviewMain.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/PreviewStage/PreviewMain.qml b/plugins/PreviewStage/PreviewMain.qml index 1600df6d4f..6b5ce2436b 100644 --- a/plugins/PreviewStage/PreviewMain.qml +++ b/plugins/PreviewStage/PreviewMain.qml @@ -14,6 +14,7 @@ Item Loader { id: previewMain + anchors.fill: parent source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : "" } From e5071eac5bb3a00c29424a15a7c4b5447d04531f Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 7 Feb 2019 14:30:10 +0100 Subject: [PATCH 4/5] Fix typing --- cura/Settings/MachineManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index d69219c7b1..0aafbd82c7 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1437,8 +1437,8 @@ class MachineManager(QObject): # Show human-readable extruder names such as "Extruder Left", "Extruder Front" instead of "Extruder 1, 2, 3". extruder_names = [] - for position in sorted(disabled_used_extruder_position_set): - extruder_stack = self._global_container_stack.extruders[str(position)] + for extruder_position in sorted(disabled_used_extruder_position_set): + extruder_stack = self._global_container_stack.extruders[str(extruder_position)] extruder_name = extruder_stack.definition.getName() extruder_names.append(extruder_name) extruders_str = ", ".join(extruder_names) From e869829f1086114ac1890444e577c69aefcdbc3e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 7 Feb 2019 15:17:07 +0100 Subject: [PATCH 5/5] Updated the icon so it also works in the dark theme --- .../cura-light/icons/sign_in_to_cloud.svg | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/resources/themes/cura-light/icons/sign_in_to_cloud.svg b/resources/themes/cura-light/icons/sign_in_to_cloud.svg index 75abb176c2..5c8f39a85b 100644 --- a/resources/themes/cura-light/icons/sign_in_to_cloud.svg +++ b/resources/themes/cura-light/icons/sign_in_to_cloud.svg @@ -1,34 +1,25 @@ - - - Group-cloud + + + Group 2 Created with Sketch. - - - - + + + + - + - - - - - - - - - - - - + - - - + + + + +