git.iko.soy/unity8
on xenial help sign in
use standard ubuntu orange color for hyperlinks
commit95b342fcc2aa34256baf3219d6ef9b7e2241dfa4 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 13 Jul 2015, 16:21 (11 years ago) parenta1c9f21
6 files changed+46−11
compare with xenial
unifiedsplit
qml/Wizard/CheckableSetting.qml+1−1 qml/Wizard/Pages/30-wifi.qml+1−5 qml/Wizard/Pages/40-location.qml+1−1 qml/Wizard/Pages/55-uaccount.qml+40−1 qml/Wizard/Pages/70-reporting.qml+1−1 qml/Wizard/Pages/here-terms.qml+2−2
qml/Wizard/CheckableSetting.qml+1−1
@@ -78,7 +78,7 @@ ListItem.Empty {
7878 rightMargin: listItem.rightMargin
7979 }
8080 wrapMode: Text.Wrap
81− linkColor: "#dd4814"
81+ linkColor: UbuntuColors.orange
8282 color: "#525252"
8383 font.weight: Font.Light
8484 fontSize: "small"
qml/Wizard/Pages/30-wifi.qml+1−5
@@ -129,9 +129,6 @@ LocalComponents.Page {
129129 accessPoint.activate();
130130 }
131131 }
132−// style: Rectangle {
133−// color: "#4c000000"
134−// }
135132
136133 Component.onCompleted: {
137134 loadAttributes();
@@ -160,10 +157,9 @@ LocalComponents.Page {
160157 id: label
161158 anchors.left: parent.left
162159 anchors.right: parent.right
163− fontSize: "small"
164160 font.weight: Font.Light
165161 color: "#525252"
166− text: mainMenu.count > 0 ? i18n.tr("Available networks…")
162+ text: mainMenu.count > 0 ? i18n.tr("Available networks")
167163 : i18n.tr("No available networks.")
168164 }
169165
qml/Wizard/Pages/40-location.qml+1−1
@@ -104,7 +104,7 @@ LocalComponents.Page {
104104 color: "#525252"
105105 font.weight: Font.Light
106106 fontSize: "small"
107− linkColor: "#dd4814"
107+ linkColor: UbuntuColors.orange
108108 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
109109 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
110110 }
qml/Wizard/Pages/55-uaccount.qml+40−1
@@ -34,7 +34,7 @@ LocalComponents.Page {
3434 anchors.left: parent.left
3535 anchors.right: parent.right
3636 wrapMode: Text.Wrap
37− text: i18n.tr("Secure my device using Ubuntu account")
37+ text: i18n.tr("Secure my device using my Ubuntu account")
3838 color: "#525252"
3939 font.weight: Font.Light
4040 fontSize: "small"
@@ -69,6 +69,45 @@ LocalComponents.Page {
6969 pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))
7070 }
7171 }
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+ }
72111 }
73112
74113 Component {
qml/Wizard/Pages/70-reporting.qml+1−1
@@ -44,7 +44,7 @@ LocalComponents.Page {
4444 anchors.right: parent.right
4545 wrapMode: Text.Wrap
4646 text: i18n.tr("Privacy policy")
47− color: "#dd4814"
47+ color: UbuntuColors.orange
4848 font.weight: Font.Light
4949 fontSize: "small"
5050 MouseArea {
qml/Wizard/Pages/here-terms.qml+2−2
@@ -101,7 +101,7 @@ LocalComponents.Page {
101101 color: "black"
102102 fontSize: "small"
103103 font.weight: Font.Light
104− linkColor: "#dd4814"
104+ linkColor: UbuntuColors.orange
105105 text: i18n.tr("By continuing, you agree to the HERE Platform Service Terms:") +
106106 " <a href=\"http://here.com/terms/service-terms\">http://here.com/terms/service-terms</a>"
107107 onLinkActivated: {
@@ -118,7 +118,7 @@ LocalComponents.Page {
118118 color: "black"
119119 fontSize: "small"
120120 font.weight: Font.Light
121− linkColor: "#dd4814"
121+ linkColor: UbuntuColors.orange
122122 text: i18n.tr("and Privacy Policy:") +
123123 " <a href=\"http://here.com/privacy/privacy-policy\">http://here.com/privacy/privacy-policy</a>"
124124 onLinkActivated: {