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

« back to all changes in this revision

Viewing changes to wizard/qml/Components/StackButton.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:
34
34
        anchors.verticalCenter: parent.verticalCenter
35
35
        anchors.left: parent.left
36
36
        anchors.right: parent.right
 
37
        color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)
37
38
        text: {
38
39
            if (backArrow) {
39
40
                // Translators: This is the arrow for "Back" buttons