From b4e4b7125d5decfa972d76153aaa0640b662210e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 20 Feb 2019 13:27:05 +0100 Subject: [PATCH 1/3] Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232] --- .../qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 606dc142be..141e85a10b 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -124,6 +124,15 @@ Item } } + // Can't use 'item: ...activeExtruderIndex' directly apparently, see also the comment on the previous block. + onVisibleChanged: + { + if (tabBar.visible) + { + tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex); + } + } + //When the model of the extruders is rebuilt, the list of extruders is briefly emptied and rebuilt. //This causes the currentIndex of the tab to be in an invalid position which resets it to 0. //Therefore we need to change it back to what it was: The active extruder index. From 5d8eb3e6e535dfc36036ff6657df293edb1f5492 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 22 Feb 2019 13:18:20 +0100 Subject: [PATCH 2/3] Fix typo --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 985ebe94a2..d6a6190be2 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -108,7 +108,7 @@ UM.Dialog RadioButton { id: allowSendButton - text: catalog.i18nc("@text:window", "Allow sending these data to Ultimaker and help us improve Cura") + text: catalog.i18nc("@text:window", "Allow sending this data to Ultimaker and help us improve Cura") exclusiveGroup: group onClicked: { From 271573d0aee3faf7c4c72cfd994b31ff6d2dac0f Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 22 Feb 2019 13:19:04 +0100 Subject: [PATCH 3/3] Fix typo... again --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index d6a6190be2..e00ad6730d 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -98,7 +98,7 @@ UM.Dialog RadioButton { id: dontSendButton - text: catalog.i18nc("@text:window", "I don't want to send these data") + text: catalog.i18nc("@text:window", "I don't want to send this data") exclusiveGroup: group onClicked: {