3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Prevent wizard pages from closing when they are "accepted" by pressing return.

Browse source 
Also removes some code replication in wizard pages.
CURA-1354
This commit is contained in:
fieldOfView 2016-04-25 13:51:22 +02:00
parent 134867f833
commit cde23edfed
4 changed files with 5 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

24
resources/qml/WizardPages/Bedleveling.qml
View file

@ -28,17 +28,6 @@ Item
UM.I18nCatalog { id: catalog; name:"cura"}
property variant wizard: null;
Connections
{
target: wizardPage.wizard
onNextClicked: //You can add functions here that get triggered when the final button is clicked in the wizard-element
{
if(wizardPage.wizard.lastPage == true){
wizardPage.wizard.visible = false
}
}
}
Label
{
id: pageTitle
@ -120,18 +109,7 @@ Item
anchors.left: parent.width < wizardPage.width ? bedlevelingButton.right : parent.left
anchors.leftMargin: parent.width < wizardPage.width ? UM.Theme.getSize("default_margin").width : 0
text: catalog.i18nc("@action:button","Skip Bedleveling");
onClicked: {
if(wizardPage.wizard.lastPage == true){
var old_page_count = wizardPage.wizard.getPageCount()
// Delete old pages (if any)
for (var i = old_page_count - 1; i > 0; i--)
{
wizardPage.wizard.removePage(i)
}
wizardPage.wizard.currentPage = 0
wizardPage.wizard.visible = false
}
}
onClicked: base.nextPage()
}
}