diff options
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardMain.qml | 9 | ||||
| -rw-r--r-- | wizard/WizardPassword.qml | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index 6cb26356..6a856e9b 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -60,15 +60,16 @@ Rectangle { } } - // disallow "next" button until passwords match + // disable "next" button until passwords match if (pages[currentPage] === passwordPage) { - nextButton.visible = passwordPage.passwordValid; + nextButton.enabled = passwordPage.passwordValid; } else if (pages[currentPage] === finishPage) { // display settings summary finishPage.updateSettingsSummary(); nextButton.visible = false } else { nextButton.visible = true + nextButton.enabled = true } } @@ -79,10 +80,10 @@ Rectangle { anchors.right: parent.right anchors.rightMargin: 50 visible: wizard.currentPage !== 1 && wizard.currentPage !== 6 - width: 50; height: 50 radius: 25 - color: nextArea.containsMouse ? "#FF4304" : "#FF6C3C" + color: enabled ? nextArea.containsMouse ? "#FF4304" : "#FF6C3C" : "#DBDBDB" + Image { anchors.centerIn: parent diff --git a/wizard/WizardPassword.qml b/wizard/WizardPassword.qml index 2926a9e9..d12409ea 100644 --- a/wizard/WizardPassword.qml +++ b/wizard/WizardPassword.qml @@ -40,10 +40,8 @@ Item { function handlePassword() { // allow to forward step only if passwords match - // print("pass1: ", passwordItem.password) - // print("pass2: ", retypePasswordItem.password) // TODO: update password strength - wizard.nextButton.visible = passwordItem.password === retypePasswordItem.password + wizard.nextButton.enabled = passwordItem.password === retypePasswordItem.password } property bool passwordValid : passwordItem.password != '' |