git.iko.soy/unity8
on xenial help sign in
address some review comments
03b0578Lukáš Tinkl
qml/Wizard/Page.qml+1−1
compare with xenial
unifiedsplit
@@ -131,7 +131,7 @@ Item {
131 name: "no-simcard"
131 name: "no-simcard"
132 height: parent.height
132 height: parent.height
133 width: height
133 width: height
134− visible: !(root.simManager0.present || root.simManager1.present)
134+ visible: !(root.simManager0.present || root.simManager1.present) && root.modemManager.modems.length > 0
135 color: "white"
135 color: "white"
136 }
136 }
137
137
qml/Wizard/Pages/10-welcome.qml+4−2
@@ -158,10 +158,12 @@ LocalComponents.Page {
158
158
159 if (!root.modemManager.available || !root.modemManager.ready || root.modemManager.modems.length === 0 ||
159 if (!root.modemManager.available || !root.modemManager.ready || root.modemManager.modems.length === 0 ||
160 (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||
160 (root.simManager0.present && root.simManager0.ready) || (root.simManager1.present && root.simManager1.ready) ||
161− root.seenSIMPage) // go to next page
161+ root.seenSIMPage) { // go to next page
162 pageStack.next();
162 pageStack.next();
163+ }
163− else
164+ else {
164 pageStack.load(Qt.resolvedUrl("sim.qml")); // show the SIM page
165 pageStack.load(Qt.resolvedUrl("sim.qml")); // show the SIM page
166+ }
165 }
167 }
166 }
168 }
167 }
169 }
qml/Wizard/Pages/30-wifi.qml−1
@@ -18,7 +18,6 @@ import QtQuick 2.4
18import QtQuick.Layouts 1.1
18import QtQuick.Layouts 1.1
19import QMenuModel 0.1 as QMenuModel
19import QMenuModel 0.1 as QMenuModel
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21−import Ubuntu.Components.ListItems 1.3
22import Wizard 0.1
21import Wizard 0.1
23import Ubuntu.Connectivity 1.0
22import Ubuntu.Connectivity 1.0
24import ".." as LocalComponents
23import ".." as LocalComponents
qml/Wizard/Pages/40-location.qml+3−1
@@ -102,7 +102,9 @@ LocalComponents.Page {
102 fontSize: "small"
102 fontSize: "small"
103 lineHeight: 1.2
103 lineHeight: 1.2
104 linkColor: UbuntuColors.orange
104 linkColor: UbuntuColors.orange
105− text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
105+ text: i18n.tr("By selecting this option you agree to the Nokia HERE") + " <a href='#'>" +
106+ // TRANSLATORS: "terms and conditions" is part of the sentence above
107+ i18n.tr("terms and conditions") + "</a>."
106 Mouse.forwardTo: hereCheckArea // clicking on the link also selects this group
108 Mouse.forwardTo: hereCheckArea // clicking on the link also selects this group
107 Mouse.priority: Mouse.AfterItem
109 Mouse.priority: Mouse.AfterItem
108 onLinkActivated: {
110 onLinkActivated: {
qml/Wizard/Pages/passcode-confirm.qml+1−1
@@ -42,7 +42,7 @@ LocalComponents.Page {
42
42
43 infoText: i18n.tr("Confirm passcode")
43 infoText: i18n.tr("Confirm passcode")
44
44
45− errorText: i18n.tr("Incorrect passcode.") + "\n" + i18n.tr("Please re-enter.")
45+ errorText: i18n.tr("Incorrect passcode.") + "\n" + i18n.ctr("Enter the passcode again", "Please re-enter.")
46
46
47 foregroundColor: textColor
47 foregroundColor: textColor
48
48