git.iko.soy/unity8
on xenial help sign in
some shuffling (again) due to different workflow
3855f5eLukáš Tinkl
qml/Wizard/Pages/uaccount-signup.qml → qml/Wizard/Pages/60-uaccount-signup.qmlrenamed+17−6
compare with xenial
unifiedsplit
@@ -26,10 +26,6 @@ LocalComponents.Page {
26 backButtonText: i18n.tr("Cancel")
26 backButtonText: i18n.tr("Cancel")
27 forwardButtonSourceComponent: forwardButton
27 forwardButtonSourceComponent: forwardButton
28
28
29− Component.onCompleted: {
30− emailInput.forceActiveFocus()
31− }
32−
33 Item {
29 Item {
34 id: column
30 id: column
35 anchors.fill: content
31 anchors.fill: content
@@ -123,6 +119,18 @@ LocalComponents.Page {
123 anchors.top: pass2Label.bottom
119 anchors.top: pass2Label.bottom
124 anchors.topMargin: units.gu(1)
120 anchors.topMargin: units.gu(1)
125 echoMode: TextInput.Password
121 echoMode: TextInput.Password
122+ KeyNavigation.tab: encryptCheck
123+ }
124+
125+ LocalComponents.CheckableSetting {
126+ id: encryptCheck
127+ objectName: "encryptCheck"
128+ showDivider: false
129+ anchors.left: parent.left
130+ anchors.right: parent.right
131+ anchors.top: pass2Input.bottom
132+ anchors.topMargin: units.gu(3)
133+ text: i18n.tr("Encrypt my content")
126 KeyNavigation.tab: optoutCheck
134 KeyNavigation.tab: optoutCheck
127 }
135 }
128
136
@@ -132,10 +140,11 @@ LocalComponents.Page {
132 showDivider: false
140 showDivider: false
133 anchors.left: parent.left
141 anchors.left: parent.left
134 anchors.right: parent.right
142 anchors.right: parent.right
135− anchors.top: pass2Input.bottom
143+ anchors.top: encryptCheck.bottom
136 anchors.topMargin: units.gu(3)
144 anchors.topMargin: units.gu(3)
137 text: i18n.tr("Opt out of cloud account (not recommended)")
145 text: i18n.tr("Opt out of cloud account (not recommended)")
138 KeyNavigation.tab: termsCheck
146 KeyNavigation.tab: termsCheck
147+ visible: false
139 }
148 }
140
149
141 LocalComponents.CheckableSetting {
150 LocalComponents.CheckableSetting {
@@ -149,13 +158,15 @@ LocalComponents.Page {
149 text: i18n.tr("I have read and accept the Ubuntu account <a href='#'>terms of service</a>")
158 text: i18n.tr("I have read and accept the Ubuntu account <a href='#'>terms of service</a>")
150 //onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml")) // TODO show terms
159 //onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml")) // TODO show terms
151 KeyNavigation.tab: emailInput
160 KeyNavigation.tab: emailInput
161+ visible: false
152 }
162 }
153 }
163 }
154
164
155 Component {
165 Component {
156 id: forwardButton
166 id: forwardButton
157 LocalComponents.StackButton {
167 LocalComponents.StackButton {
158− enabled: emailInput.acceptableInput && termsCheck.checked &&
168+ enabled: emailInput.acceptableInput &&
169+ //termsCheck.checked && // FIXME re-enable when the checkboxes get visible again
159 passInput.text !== "" && pass2Input.text !== "" && passInput.text === pass2Input.text
170 passInput.text !== "" && pass2Input.text !== "" && passInput.text === pass2Input.text
160 text: i18n.tr("Sign Up")
171 text: i18n.tr("Sign Up")
161 onClicked: pageStack.next() // TODO sign up against U1
172 onClicked: pageStack.next() // TODO sign up against U1
qml/Wizard/Pages/60-passwd-type.qml → qml/Wizard/Pages/70-passwd-type.qmlrenamed

The content is the same.

qml/Wizard/Pages/70-reporting.qmldeleted−69
@@ -1,69 +0,0 @@
1−/*
2− * Copyright (C) 2013-2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.3
18−import Ubuntu.Components 1.2
19−import ".." as LocalComponents
20−
21−LocalComponents.Page {
22− objectName: "reportingPage"
23−
24− title: i18n.tr("Help us improve")
25− forwardButtonSourceComponent: forwardButton
26−
27− Column {
28− id: column
29− anchors.fill: content
30− spacing: units.gu(3)
31− anchors.topMargin: units.gu(4)
32−
33− LocalComponents.CheckableSetting {
34− id: reportCheck
35− objectName: "reportCheck"
36− showDivider: false
37− text: i18n.tr("Improve your system performance by sending us crashes and error reports.")
38− checked: true
39− }
40−
41− Label {
42− anchors.left: parent.left
43− anchors.leftMargin: reportCheck.labelOffset
44− anchors.right: parent.right
45− wrapMode: Text.Wrap
46− text: i18n.tr("Privacy policy")
47− color: UbuntuColors.orange
48− font.weight: Font.Light
49− fontSize: "small"
50− MouseArea {
51− anchors.fill: parent
52− cursorShape: Qt.PointingHandCursor
53− onClicked: {
54− // TODO
55− print("Display privacy policy")
56− }
57− }
58− }
59− }
60−
61− Component {
62− id: forwardButton
63− LocalComponents.StackButton {
64− // TODO save the policy somewhere?
65− text: i18n.tr("Next")
66− onClicked: pageStack.next()
67− }
68− }
69−}
qml/Wizard/Pages/55-uaccount.qml → qml/Wizard/Pages/uaccount.qmlrenamed

The content is the same.