3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge remote-tracking branch 'origin/4.0'

Browse source
This commit is contained in:
Lipu Fei 2019-02-22 13:38:29 +01:00
commit 4d3211e651
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/SliceInfoPlugin/MoreInfoWindow.qml
View file

@ -98,7 +98,7 @@ UM.Dialog
RadioButton RadioButton
{ {
id: dontSendButton 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 exclusiveGroup: group
onClicked: onClicked:
{ {
@ -108,7 +108,7 @@ UM.Dialog
RadioButton RadioButton
{ {
id: allowSendButton 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 exclusiveGroup: group
onClicked: onClicked:
{ {

9
resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml
View file

@ -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. //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. //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. //Therefore we need to change it back to what it was: The active extruder index.