Fix that you can only cancel in WizardDialog

CURA-6483
This commit is contained in:
Lipu Fei 2019-04-29 15:16:40 +02:00
parent bed13bf42b
commit defcba6927
5 changed files with 17 additions and 19 deletions

View file

@ -795,7 +795,6 @@ UM.MainWindow
title: catalog.i18nc("@title:window", "Add Printer")
model: CuraApplication.getAddPrinterPagesModel()
progressBarVisible: false
hasCancelButton: true
}
Cura.WizardDialog
@ -804,7 +803,6 @@ UM.MainWindow
title: catalog.i18nc("@title:window", "What's New")
model: CuraApplication.getWhatsNewPagesModel()
progressBarVisible: false
hasCancelButton: false
}
Connections

View file

@ -104,6 +104,20 @@ Item
}
}
// This "Back" button only shows in the "Add Machine" dialog, which has "back_button_text" set to "Cancel"
Cura.SecondaryButton
{
id: backButton
anchors.left: parent.left
anchors.bottom: parent.bottom
visible: base.currentItem.previous_page_button_text
text: base.currentItem.previous_page_button_text
onClicked:
{
base.endWizard()
}
}
Cura.PrimaryButton
{
id: nextButton

View file

@ -31,7 +31,6 @@ Window
property var model: null // Needs to be set by whoever is using this dialog.
property alias progressBarVisible: wizardPanel.progressBarVisible
property alias hasCancelButton: cancelButton.visible
onVisibilityChanged:
{
@ -54,20 +53,4 @@ Window
target: model
onAllFinished: dialog.hide()
}
Cura.SecondaryButton
{
id: cancelButton
text: catalog.i18nc("@button", "Cancel")
visible: false
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.margins: UM.Theme.getSize("default_margin").width
enabled: true
onClicked: dialog.visible = false
}
}