~mterry/ubuntu-system-settings/wizard-introspection-rtm

« back to all changes in this revision

Viewing changes to wizard/qml/Pages/passwd-confirm.qml

  • Committer: CI bot
  • Author(s): Michael Terry
  • Date: 2014-11-03 19:58:01 UTC
  • mfrom: (931.1.3 passphrase-continue-rtm)
  • Revision ID: ps-jenkins@lists.canonical.com-20141103195801-mdl3falwkhzjwm17
Add a Continue button when choosing a passphrase. And fix a few other design nits with choosing a password.

Specifically:
 - Add a Continue button on the passphrase screens
 - Remove the Skip button on the first passcode screen
 - Fix phrasing of "4 numbers" to "4 digits only"
 - When pressing Back on the Wi-Fi screen, go to "Lock security" page instead of the "Choose a password" page.

Visual designs here: https://drive.google.com/a/canonical.com/folderview?id=0B8I8ZVKH-8SsM1QyMmhWbkpRLTg

This branch requires a change in the unity8 Lockscreen component that exposes the passphrase content to us. Thus, I've bumped the required unity8 version. Fixes: 1383702

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
 
28
28
LocalComponents.Page {
29
29
    id: passwdSetPage
 
30
    forwardButtonSourceComponent: forwardButton
30
31
 
31
32
    skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
32
33
 
65
66
            }
66
67
        }
67
68
    }
 
69
 
 
70
    Component {
 
71
        id: forwardButton
 
72
        LocalComponents.StackButton {
 
73
            visible: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
 
74
            enabled: root.password === lockscreen.passphrase
 
75
            text: i18n.tr("Continue")
 
76
            onClicked: pageStack.next()
 
77
        }
 
78
    }
68
79
}