git.iko.soy/unity8
on xenial help sign in
port the reporting page
29f1d6cLukáš Tinkl
qml/Wizard/Pages/70-reporting.qml+26−12
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013,2014 Canonical, Ltd.
2+ * Copyright (C) 2013-2015 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
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
5 * it under the terms of the GNU General Public License as published by
@@ -14,40 +14,54 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
15 */
16
16
17−import QtQuick 2.0
17+import QtQuick 2.3
18−import Ubuntu.Components 0.1
18+import Ubuntu.Components 1.2
19import ".." as LocalComponents
19import ".." as LocalComponents
20
20
21LocalComponents.Page {
21LocalComponents.Page {
22 objectName: "reportingPage"
22 objectName: "reportingPage"
23
23
24− title: i18n.tr("Improving your experience")
24+ title: i18n.tr("Help us improve")
25 forwardButtonSourceComponent: forwardButton
25 forwardButtonSourceComponent: forwardButton
26
26
27 Column {
27 Column {
28 id: column
28 id: column
29 anchors.fill: content
29 anchors.fill: content
30− spacing: units.gu(2)
30+ spacing: units.gu(3)
31+ anchors.topMargin: units.gu(4)
31
32
32− Label {
33+ LocalComponents.CheckableSetting {
33− anchors.left: parent.left
34+ id: reportCheck
34− anchors.right: parent.right
35+ objectName: "reportCheck"
35− wrapMode: Text.Wrap
36+ showDivider: false
36− text: i18n.tr("Your phone is set up to automatically report errors to Canonical and its partners, the makers of the operating system.")
37+ text: i18n.tr("Improve your system performance by sending us crashes and error reports.")
38+ checked: true
37 }
39 }
38
40
39 Label {
41 Label {
40 anchors.left: parent.left
42 anchors.left: parent.left
43+ anchors.leftMargin: reportCheck.labelOffset
41 anchors.right: parent.right
44 anchors.right: parent.right
42 wrapMode: Text.Wrap
45 wrapMode: Text.Wrap
43− text: i18n.tr("This can be disabled in <b>System Settings</b> under <b>Security &amp; Privacy</b>")
46+ text: i18n.tr("Privacy policy")
47+ color: "#dd4814"
48+ font.weight: Font.Light
49+ MouseArea {
50+ anchors.fill: parent
51+ cursorShape: Qt.PointingHandCursor
52+ onClicked: {
53+ // TODO
54+ print("Display privacy policy")
55+ }
56+ }
44 }
57 }
45 }
58 }
46
59
47 Component {
60 Component {
48 id: forwardButton
61 id: forwardButton
49 LocalComponents.StackButton {
62 LocalComponents.StackButton {
63+ // TODO save the policy somewhere?
50− text: i18n.tr("Continue")
64+ text: i18n.tr("Next")
51 onClicked: pageStack.next()
65 onClicked: pageStack.next()
52 }
66 }
53 }
67 }