git.iko.soy/unity8
on xenial help sign in
use standard ubuntu orange color for hyperlinks
95b342fLukáš Tinkl
qml/Wizard/CheckableSetting.qml+1−1
compare with xenial
unifiedsplit
@@ -78,7 +78,7 @@ ListItem.Empty {
78 rightMargin: listItem.rightMargin
78 rightMargin: listItem.rightMargin
79 }
79 }
80 wrapMode: Text.Wrap
80 wrapMode: Text.Wrap
81− linkColor: "#dd4814"
81+ linkColor: UbuntuColors.orange
82 color: "#525252"
82 color: "#525252"
83 font.weight: Font.Light
83 font.weight: Font.Light
84 fontSize: "small"
84 fontSize: "small"
qml/Wizard/Pages/30-wifi.qml+1−5
@@ -129,9 +129,6 @@ LocalComponents.Page {
129 accessPoint.activate();
129 accessPoint.activate();
130 }
130 }
131 }
131 }
132−// style: Rectangle {
133−// color: "#4c000000"
134−// }
135
132
136 Component.onCompleted: {
133 Component.onCompleted: {
137 loadAttributes();
134 loadAttributes();
@@ -160,10 +157,9 @@ LocalComponents.Page {
160 id: label
157 id: label
161 anchors.left: parent.left
158 anchors.left: parent.left
162 anchors.right: parent.right
159 anchors.right: parent.right
163− fontSize: "small"
164 font.weight: Font.Light
160 font.weight: Font.Light
165 color: "#525252"
161 color: "#525252"
166− text: mainMenu.count > 0 ? i18n.tr("Available networks…")
162+ text: mainMenu.count > 0 ? i18n.tr("Available networks")
167 : i18n.tr("No available networks.")
163 : i18n.tr("No available networks.")
168 }
164 }
169
165
qml/Wizard/Pages/40-location.qml+1−1
@@ -104,7 +104,7 @@ LocalComponents.Page {
104 color: "#525252"
104 color: "#525252"
105 font.weight: Font.Light
105 font.weight: Font.Light
106 fontSize: "small"
106 fontSize: "small"
107− linkColor: "#dd4814"
107+ linkColor: UbuntuColors.orange
108 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
108 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
109 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
109 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
110 }
110 }
qml/Wizard/Pages/55-uaccount.qml+40−1
@@ -34,7 +34,7 @@ LocalComponents.Page {
34 anchors.left: parent.left
34 anchors.left: parent.left
35 anchors.right: parent.right
35 anchors.right: parent.right
36 wrapMode: Text.Wrap
36 wrapMode: Text.Wrap
37− text: i18n.tr("Secure my device using Ubuntu account")
37+ text: i18n.tr("Secure my device using my Ubuntu account")
38 color: "#525252"
38 color: "#525252"
39 font.weight: Font.Light
39 font.weight: Font.Light
40 fontSize: "small"
40 fontSize: "small"
@@ -69,6 +69,45 @@ LocalComponents.Page {
69 pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))
69 pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))
70 }
70 }
71 }
71 }
72+
73+ LocalComponents.CheckableSetting {
74+ anchors {
75+ left: parent.left
76+ right: parent.right
77+ bottom: privacyLabel.top
78+ bottomMargin: units.gu(2)
79+ }
80+
81+ id: reportCheck
82+ objectName: "reportCheck"
83+ showDivider: false
84+ text: i18n.tr("Improve system performance by sending us crashes and error reports.")
85+ checked: true
86+ }
87+
88+ Label {
89+ id: privacyLabel
90+ anchors {
91+ left: parent.left
92+ right: parent.right
93+ bottom: parent.bottom
94+ leftMargin: reportCheck.labelOffset
95+ bottomMargin: units.gu(4)
96+ }
97+ wrapMode: Text.Wrap
98+ text: i18n.tr("Privacy policy")
99+ color: UbuntuColors.orange
100+ font.weight: Font.Light
101+ fontSize: "small"
102+ MouseArea {
103+ anchors.fill: parent
104+ cursorShape: Qt.PointingHandCursor
105+ onClicked: {
106+ // TODO
107+ print("Display privacy policy")
108+ }
109+ }
110+ }
72 }
111 }
73
112
74 Component {
113 Component {
qml/Wizard/Pages/70-reporting.qml+1−1
@@ -44,7 +44,7 @@ LocalComponents.Page {
44 anchors.right: parent.right
44 anchors.right: parent.right
45 wrapMode: Text.Wrap
45 wrapMode: Text.Wrap
46 text: i18n.tr("Privacy policy")
46 text: i18n.tr("Privacy policy")
47− color: "#dd4814"
47+ color: UbuntuColors.orange
48 font.weight: Font.Light
48 font.weight: Font.Light
49 fontSize: "small"
49 fontSize: "small"
50 MouseArea {
50 MouseArea {
qml/Wizard/Pages/here-terms.qml+2−2
@@ -101,7 +101,7 @@ LocalComponents.Page {
101 color: "black"
101 color: "black"
102 fontSize: "small"
102 fontSize: "small"
103 font.weight: Font.Light
103 font.weight: Font.Light
104− linkColor: "#dd4814"
104+ linkColor: UbuntuColors.orange
105 text: i18n.tr("By continuing, you agree to the HERE Platform Service Terms:") +
105 text: i18n.tr("By continuing, you agree to the HERE Platform Service Terms:") +
106 " <a href=\"http://here.com/terms/service-terms\">http://here.com/terms/service-terms</a>"
106 " <a href=\"http://here.com/terms/service-terms\">http://here.com/terms/service-terms</a>"
107 onLinkActivated: {
107 onLinkActivated: {
@@ -118,7 +118,7 @@ LocalComponents.Page {
118 color: "black"
118 color: "black"
119 fontSize: "small"
119 fontSize: "small"
120 font.weight: Font.Light
120 font.weight: Font.Light
121− linkColor: "#dd4814"
121+ linkColor: UbuntuColors.orange
122 text: i18n.tr("and Privacy Policy:") +
122 text: i18n.tr("and Privacy Policy:") +
123 " <a href=\"http://here.com/privacy/privacy-policy\">http://here.com/privacy/privacy-policy</a>"
123 " <a href=\"http://here.com/privacy/privacy-policy\">http://here.com/privacy/privacy-policy</a>"
124 onLinkActivated: {
124 onLinkActivated: {