From e087db7c2e0ce3857e16b14c499d5d239abc8828 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 16 Nov 2018 13:26:03 +0100 Subject: [PATCH 1/2] Code style and fixes to comments Contributes to issue CURA-5785. --- plugins/PreviewStage/PreviewMenu.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/PreviewStage/PreviewMenu.qml b/plugins/PreviewStage/PreviewMenu.qml index bf162be4e3..a3235d7cb8 100644 --- a/plugins/PreviewStage/PreviewMenu.qml +++ b/plugins/PreviewStage/PreviewMenu.qml @@ -54,13 +54,13 @@ Item { for (var i = 0; i < viewModel.rowCount(); i++) { - if(viewModel.getItem(i).active) + if (viewModel.getItem(i).active) { return viewModel.getItem(i) } } // Nothing was active, so just return the first one (the list is sorted by priority, so the most - // important one sshould be returned) + // important one should be returned) return viewModel.getItem(0) } From 3ef6d0544a02705eba13e5e115c3e1f40694fb95 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 16 Nov 2018 14:11:04 +0100 Subject: [PATCH 2/2] Fix spelling and indents Ant-fuckery, as they say in the low lands. Contributes to issue CURA-5785. --- resources/qml/IconWithText.qml | 2 +- resources/qml/MachineSelector.qml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml index d19c7e3899..9ce2f412cc 100644 --- a/resources/qml/IconWithText.qml +++ b/resources/qml/IconWithText.qml @@ -10,7 +10,7 @@ import Cura 1.0 as Cura // Reusable component that holds an (re-colorable) icon on the left with some text on the right. // This component is also designed to be used with layouts. It will use the width of the text + icon as preferred width -// It sets the icon size + half of the content as it's minium width (in which case it will elide the text) +// It sets the icon size + half of the content as its minium width (in which case it will elide the text) Item { property alias iconColor: icon.color diff --git a/resources/qml/MachineSelector.qml b/resources/qml/MachineSelector.qml index b18f427980..fa680fa9a6 100644 --- a/resources/qml/MachineSelector.qml +++ b/resources/qml/MachineSelector.qml @@ -80,8 +80,8 @@ Cura.ExpandableComponent radius: UM.Theme.getSize("default_radius").width onClicked: { - togglePopup() - Cura.MachineManager.setActiveMachine(model.id) + togglePopup() + Cura.MachineManager.setActiveMachine(model.id) } Connections