git.iko.soy/unity8
on xenial help sign in
visual updates
a7df3d9Lukáš Tinkl
qml/Wizard/Pages/70-passwd-type.qml+2−26
compare with xenial
unifiedsplit
@@ -57,35 +57,11 @@ LocalComponents.Page {
57 Item {
57 Item {
58 id: column
58 id: column
59 anchors.fill: content
59 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− }
83
60
84 ListView {
61 ListView {
85 id: selector
62 id: selector
86 anchors.left: parent.left
63 anchors.left: parent.left
87 anchors.right: parent.right
64 anchors.right: parent.right
88− anchors.top: divider.bottom
89 boundsBehavior: Flickable.StopAtBounds
65 boundsBehavior: Flickable.StopAtBounds
90 clip: true
66 clip: true
91 height: childrenRect.height
67 height: childrenRect.height
@@ -116,9 +92,9 @@ LocalComponents.Page {
116 case 1:
92 case 1:
117 return i18n.ctr("Label: Type of security method", "New password");
93 return i18n.ctr("Label: Type of security method", "New password");
118 case 2:
94 case 2:
119− return i18n.ctr("Label: Type of security method", "Passcode");
95+ return i18n.ctr("Label: Type of security method", "Passcode (numbers only)");
120 case 3:
96 case 3:
121− return i18n.ctr("Label: Type of security method", "Swipe");
97+ return i18n.ctr("Label: Type of security method", "No lock code");
122 }
98 }
123 }
99 }
124 }
100 }
qml/Wizard/Pages/password-set.qml+2−2
@@ -69,7 +69,7 @@ LocalComponents.Page {
69 if (!!text) {
69 if (!!text) {
70 infoLabel.text = text;
70 infoLabel.text = text;
71 } else {
71 } else {
72− infoLabel.text = i18n.tr("Enter at least 6 characters");
72+ infoLabel.text = i18n.tr("Enter at least 8 characters");
73 }
73 }
74 }
74 }
75
75
@@ -158,7 +158,7 @@ LocalComponents.Page {
158 }
158 }
159 text: i18n.tr("OK")
159 text: i18n.tr("OK")
160 color: okColor
160 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?
162 onClicked: {
162 onClicked: {
163 if (confirmPhase) {
163 if (confirmPhase) {
164 pageStack.next();
164 pageStack.next();