on xenial help sign in
visual updates
commita7df3d9af7ebf566f38d2e9c3f17d9c4a4c94952 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 10 Nov 2015, 18:18 (11 years ago) parent63783c6
2 files changed+4−28
qml/Wizard/Pages/70-passwd-type.qml+2−26 qml/Wizard/Pages/password-set.qml+2−2
qml/Wizard/Pages/70-passwd-type.qml+2−26
@@ -57,35 +57,11 @@ LocalComponents.Page {
5757 Item {
5858 id: column
5959 anchors.fill: content
60− anchors.topMargin: customMargin
61−
62− Label {
63− id: infoLabel
64− anchors.left: parent.left
65− anchors.right: parent.right
66− anchors.leftMargin: leftMargin
67− wrapMode: Text.Wrap
68− text: i18n.tr("Choose lock screen security")
69− color: textColor
70− fontSize: "small"
71− font.weight: Font.Light
72− }
73−
74− Rectangle {
75− id: divider
76− anchors.left: parent.left
77− anchors.right: parent.right
78− anchors.top: infoLabel.bottom
79− anchors.topMargin: units.gu(3)
80− height: units.dp(1)
81− color: dividerColor
82− }
8360
8461 ListView {
8562 id: selector
8663 anchors.left: parent.left
8764 anchors.right: parent.right
88− anchors.top: divider.bottom
8965 boundsBehavior: Flickable.StopAtBounds
9066 clip: true
9167 height: childrenRect.height
@@ -116,9 +92,9 @@ LocalComponents.Page {
11692 case 1:
11793 return i18n.ctr("Label: Type of security method", "New password");
11894 case 2:
119− return i18n.ctr("Label: Type of security method", "Passcode");
95+ return i18n.ctr("Label: Type of security method", "Passcode (numbers only)");
12096 case 3:
121− return i18n.ctr("Label: Type of security method", "Swipe");
97+ return i18n.ctr("Label: Type of security method", "No lock code");
12298 }
12399 }
124100 }
qml/Wizard/Pages/password-set.qml+2−2
@@ -69,7 +69,7 @@ LocalComponents.Page {
6969 if (!!text) {
7070 infoLabel.text = text;
7171 } else {
72− infoLabel.text = i18n.tr("Enter at least 6 characters");
72+ infoLabel.text = i18n.tr("Enter at least 8 characters");
7373 }
7474 }
7575
@@ -158,7 +158,7 @@ LocalComponents.Page {
158158 }
159159 text: i18n.tr("OK")
160160 color: okColor
161− enabled: confirmPhase ? password === root.password : password.length > 5 // TODO set more sensible restrictions for the length?
161+ enabled: confirmPhase ? password === root.password : password.length > 7 // TODO set more sensible restrictions for the length?
162162 onClicked: {
163163 if (confirmPhase) {
164164 pageStack.next();