git.iko.soy/unity8
on xenial help sign in
tweak the Location/Terms visuals and text
18d2cfdLukáš Tinkl
qml/Wizard/CheckableSetting.qml+1
compare with xenial
unifiedsplit
@@ -78,6 +78,7 @@ ListItem.Empty {
78 }
78 }
79 wrapMode: Text.Wrap
79 wrapMode: Text.Wrap
80 linkColor: Theme.palette.normal.foregroundText
80 linkColor: Theme.palette.normal.foregroundText
81+ color: "black"
81 onLinkActivated: listItem.linkActivated(link)
82 onLinkActivated: listItem.linkActivated(link)
82 }
83 }
83 }
84 }
qml/Wizard/Pages/40-timezone.qml−1
@@ -98,7 +98,6 @@ LocalComponents.Page {
98
98
99 Column {
99 Column {
100 id: column
100 id: column
101− spacing: units.gu(4)
102 anchors.fill: content
101 anchors.fill: content
103 anchors.topMargin: units.gu(4)
102 anchors.topMargin: units.gu(4)
104
103
qml/Wizard/Pages/50-location.qml+26−27
@@ -18,13 +18,13 @@ import QtQuick 2.3
18import AccountsService 0.1
18import AccountsService 0.1
19import QMenuModel 0.1 as QMenuModel
19import QMenuModel 0.1 as QMenuModel
20import Qt.labs.folderlistmodel 2.1
20import Qt.labs.folderlistmodel 2.1
21−import Ubuntu.Components 1.1
21+import Ubuntu.Components 1.2
22import ".." as LocalComponents
22import ".." as LocalComponents
23
23
24LocalComponents.Page {
24LocalComponents.Page {
25 objectName: "locationPage"
25 objectName: "locationPage"
26
26
27− title: i18n.tr("Location")
27+ title: i18n.tr("Location Services")
28 forwardButtonSourceComponent: forwardButton
28 forwardButtonSourceComponent: forwardButton
29
29
30 property bool pathSet: AccountsService.hereLicensePathValid
30 property bool pathSet: AccountsService.hereLicensePathValid
@@ -53,37 +53,20 @@ LocalComponents.Page {
53 Column {
53 Column {
54 id: column
54 id: column
55 anchors.fill: content
55 anchors.fill: content
56− spacing: units.gu(3)
56+ spacing: units.gu(4)
57−
57+ anchors.topMargin: units.gu(4)
58− Label {
59− anchors.left: parent.left
60− anchors.right: parent.right
61− wrapMode: Text.Wrap
62− text: i18n.tr("Let the phone detect your location:")
63− }
64−
65− LocalComponents.CheckableSetting {
66− id: gpsCheck
67− objectName: "gpsCheck"
68− showDivider: false
69− text: i18n.tr("Using GPS only (less accurate)")
70− onTriggered: {
71− gpsCheck.checked = true;
72− hereCheck.checked = false;
73− nopeCheck.checked = false;
74− }
75− }
76
58
77 Column {
59 Column {
78 anchors.left: parent.left
60 anchors.left: parent.left
79 anchors.right: parent.right
61 anchors.right: parent.right
80 height: childrenRect.height
62 height: childrenRect.height
63+ spacing: units.gu(2)
81
64
82 LocalComponents.CheckableSetting {
65 LocalComponents.CheckableSetting {
83 id: hereCheck
66 id: hereCheck
84 objectName: "hereCheck"
67 objectName: "hereCheck"
85 showDivider: false
68 showDivider: false
86− text: i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info (recommended)")
69+ text: i18n.tr("Use GPS, Wi-FI hotspots nad mobile network anonymously to detect location (recommended)")
87 checked: true
70 checked: true
88 onTriggered: {
71 onTriggered: {
89 gpsCheck.checked = false;
72 gpsCheck.checked = false;
@@ -93,23 +76,38 @@ LocalComponents.Page {
93 }
76 }
94
77
95 Label {
78 Label {
79+ id: termsLabel
96 objectName: "hereTermsLink"
80 objectName: "hereTermsLink"
97 anchors.left: parent.left
81 anchors.left: parent.left
98 anchors.leftMargin: hereCheck.labelOffset
82 anchors.leftMargin: hereCheck.labelOffset
99 anchors.right: parent.right
83 anchors.right: parent.right
100 wrapMode: Text.Wrap
84 wrapMode: Text.Wrap
101− linkColor: Theme.palette.normal.foregroundText
85+ linkColor: UbuntuColors.darkGrey
86+ color: "black"
87+ fontSize: "small"
102 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
88 // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
103 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
89 text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
104 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
90 onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
105 }
91 }
106 }
92 }
107
93
94+ LocalComponents.CheckableSetting {
95+ id: gpsCheck
96+ objectName: "gpsCheck"
97+ showDivider: false
98+ text: i18n.tr("GPS only")
99+ onTriggered: {
100+ gpsCheck.checked = true;
101+ hereCheck.checked = false;
102+ nopeCheck.checked = false;
103+ }
104+ }
105+
108 LocalComponents.CheckableSetting {
106 LocalComponents.CheckableSetting {
109 id: nopeCheck
107 id: nopeCheck
110 objectName: "nopeCheck"
108 objectName: "nopeCheck"
111 showDivider: false
109 showDivider: false
112− text: i18n.tr("Not at all")
110+ text: i18n.tr("Don't use my location")
113 onTriggered: {
111 onTriggered: {
114 gpsCheck.checked = false;
112 gpsCheck.checked = false;
115 hereCheck.checked = false;
113 hereCheck.checked = false;
@@ -121,14 +119,15 @@ LocalComponents.Page {
121 anchors.left: parent.left
119 anchors.left: parent.left
122 anchors.right: parent.right
120 anchors.right: parent.right
123 wrapMode: Text.Wrap
121 wrapMode: Text.Wrap
124− text: i18n.tr("You can change your mind later in <b>System Settings</b>.")
122+ text: i18n.tr("You can change it later in <b>System Settings</b>.")
123+ color: "black"
125 }
124 }
126 }
125 }
127
126
128 Component {
127 Component {
129 id: forwardButton
128 id: forwardButton
130 LocalComponents.StackButton {
129 LocalComponents.StackButton {
131− text: i18n.tr("Continue")
130+ text: i18n.tr("Next")
132 onClicked: {
131 onClicked: {
133 var locationOn = gpsCheck.checked || hereCheck.checked;
132 var locationOn = gpsCheck.checked || hereCheck.checked;
134 var gpsOn = gpsCheck.checked || hereCheck.checked;
133 var gpsOn = gpsCheck.checked || hereCheck.checked;
qml/Wizard/Pages/here-terms.qml+3−1
@@ -41,6 +41,7 @@ LocalComponents.Page {
41 }
41 }
42
42
43 function defaultCountryForLanguage(lang) {
43 function defaultCountryForLanguage(lang) {
44+ if (lang === "cs") return "CZ"
44 if (lang === "da") return "DK"
45 if (lang === "da") return "DK"
45 if (lang === "en") return "US"
46 if (lang === "en") return "US"
46 if (lang === "ko") return "KR"
47 if (lang === "ko") return "KR"
@@ -102,7 +103,8 @@ LocalComponents.Page {
102 anchors.left: parent.left
103 anchors.left: parent.left
103 anchors.right: parent.right
104 anchors.right: parent.right
104 wrapMode: Text.Wrap
105 wrapMode: Text.Wrap
105− linkColor: Theme.palette.normal.foregroundText
106+ color: "black"
107+ linkColor: UbuntuColors.darkGrey
106 onLinkActivated: {
108 onLinkActivated: {
107 webview.url = link
109 webview.url = link
108 termsLabel.visible = false
110 termsLabel.visible = false