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.1'

Browse source
This commit is contained in:
Lipu Fei 2019-05-17 15:01:40 +02:00
commit 0c15f69c44
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Cura.qml
View file

@ -818,7 +818,12 @@ UM.MainWindow
Connections Connections
{ {
target: Cura.Actions.addMachine target: Cura.Actions.addMachine
onTriggered: addMachineDialog.show() onTriggered:
{
// Make sure to show from the first page when the dialog shows up.
addMachineDialog.resetModelState()
addMachineDialog.show()
}
} }
AboutDialog AboutDialog

7
resources/qml/WelcomePages/WizardDialog.qml
View file

@ -30,12 +30,9 @@ Window
property var model: null // Needs to be set by whoever is using this dialog. property var model: null // Needs to be set by whoever is using this dialog.
property alias progressBarVisible: wizardPanel.progressBarVisible property alias progressBarVisible: wizardPanel.progressBarVisible
onVisibilityChanged: function resetModelState()
{ {
if (visible) model.resetState()
{
model.resetState()
}
} }
WizardPanel WizardPanel