uNav

Merge lp:~nik90/unav/0.59-minor-fixes into lp:unav

  1. 0.59-minor-fixes
  2. Merge into trunk
Proposed by Nekhelesh Ramananthan
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 51
Merged at revision: 47
Proposed branch: lp:~nik90/unav/0.59-minor-fixes
Merge into: lp:unav
Diff against target: 162 lines (+18/-17)
9 files modified
qml/Main.qml (+4/-4)
qml/Nearby.qml (+2/-2)
qml/PoiListPage.qml (+0/-1)
qml/PoiPage.qml (+0/-2)
qml/RoutePage.qml (+1/-1)
qml/SearchPage.qml (+0/-1)
qml/SettingsPage.qml (+9/-1)
qml/tuto/Slide3.qml (+1/-1)
qml/tuto/components/Walkthrough.qml (+1/-4)
To merge this branch: bzr merge lp:~nik90/unav/0.59-minor-fixes
Reviewer Review Type Date Requested Status
costales Approve
Review via email: mp+291909@code.launchpad.net

Description of the change

Just minor fixes

To post a comment you must log in.
lp:~nik90/unav/0.59-minor-fixes updated
50. By Nekhelesh Ramananthan

minor fix

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Waiting on Marcos's update welcome wizard images. Don't merge before that.

lp:~nik90/unav/0.59-minor-fixes updated
51. By Nekhelesh Ramananthan

Fixed link not clickable in the warn radar dialog

Revision history for this message
costales (costales) wrote :

Nice touch :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qml/Main.qml'
--- qml/Main.qml 2016-04-13 17:52:10 +0000
+++ qml/Main.qml 2016-04-14 16:55:42 +0000
@@ -168,8 +168,8 @@
168168
169 Action {169 Action {
170 id: routeAction170 id: routeAction
171 iconName: "send"171 iconName: "view-grid-symbolic"
172 text: i18n.tr("Route")172 text: i18n.tr("Menu")
173 enabled: navigationPage.buttonsEnabled173 enabled: navigationPage.buttonsEnabled
174 onTriggered: {174 onTriggered: {
175 mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))175 mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
@@ -383,7 +383,7 @@
383 opacity: navigationPage.buttonsEnabled ? 1.0 : 0.3383 opacity: navigationPage.buttonsEnabled ? 1.0 : 0.3
384384
385 ActionIcon {385 ActionIcon {
386 icon.name: "send"386 icon.name: "view-grid-symbolic"
387 enabled: navigationPage.buttonsEnabled387 enabled: navigationPage.buttonsEnabled
388 onClicked: mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))388 onClicked: mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
389 }389 }
@@ -487,7 +487,7 @@
487 icon.height: units.gu(3)487 icon.height: units.gu(3)
488 highlightSize: units.gu(-1)488 highlightSize: units.gu(-1)
489 onClicked: {489 onClicked: {
490 mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Main.qml", "lat": mainPageStack.clickedLat, "lng": mainPageStack.clickedLng})490 mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.clickedLat, "lng": mainPageStack.clickedLng})
491 }491 }
492 }492 }
493493
494494
=== modified file 'qml/Nearby.qml'
--- qml/Nearby.qml 2016-04-10 09:43:33 +0000
+++ qml/Nearby.qml 2016-04-14 16:55:42 +0000
@@ -71,9 +71,9 @@
7171
72 onClicked: {72 onClicked: {
73 if (model.mode === "CURRENT") {73 if (model.mode === "CURRENT") {
74 mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Nearby.qml", "lat": mainPageStack.currentLat, "lng": mainPageStack.currentLng})74 mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.currentLat, "lng": mainPageStack.currentLng})
75 } else if (model.mode === "DESTINATION") {75 } else if (model.mode === "DESTINATION") {
76 mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Nearby.qml", "lat": mainPageStack.endLat, "lng": mainPageStack.endLng})76 mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
77 } else if (model.mode === "MAP") {77 } else if (model.mode === "MAP") {
78 mainPageStack.clear(); // Show map78 mainPageStack.clear(); // Show map
79 mainPageStack.executeJavaScript("force_show_map()");79 mainPageStack.executeJavaScript("force_show_map()");
8080
=== modified file 'qml/PoiListPage.qml'
--- qml/PoiListPage.qml 2016-04-12 12:43:05 +0000
+++ qml/PoiListPage.qml 2016-04-14 16:55:42 +0000
@@ -25,7 +25,6 @@
25Page {25Page {
26 id: poiListPage26 id: poiListPage
2727
28 property var fromPage
29 property var lat28 property var lat
30 property var lng29 property var lng
31 property string poiType: ""30 property string poiType: ""
3231
=== modified file 'qml/PoiPage.qml'
--- qml/PoiPage.qml 2016-04-10 10:28:45 +0000
+++ qml/PoiPage.qml 2016-04-14 16:55:42 +0000
@@ -26,7 +26,6 @@
26Page {26Page {
27 id: poiPage27 id: poiPage
2828
29 property var fromPage
30 property var lat29 property var lat
31 property var lng30 property var lng
32 property string unit: navApp.settings.unit === 0 ? "km" : "mi"31 property string unit: navApp.settings.unit === 0 ? "km" : "mi"
@@ -187,7 +186,6 @@
187 poiSearchField.text = ""186 poiSearchField.text = ""
188 poiPage.header = standardHeader187 poiPage.header = standardHeader
189 mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"), {188 mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"), {
190 fromPage: poiPage,
191 lat: poiPage.lat,189 lat: poiPage.lat,
192 lng: poiPage.lng,190 lng: poiPage.lng,
193 poiType: model.label,191 poiType: model.label,
194192
=== modified file 'qml/RoutePage.qml'
--- qml/RoutePage.qml 2016-04-11 19:28:39 +0000
+++ qml/RoutePage.qml 2016-04-14 16:55:42 +0000
@@ -23,7 +23,7 @@
23 id: routePage23 id: routePage
2424
25 header: UNavHeader {25 header: UNavHeader {
26 title: i18n.tr("Route")26 title: i18n.tr("Menu")
27 flickable: flickable27 flickable: flickable
28 28
29 // #FIXME: This back button is only here to allow the user to press Escape keyboard key to go back.29 // #FIXME: This back button is only here to allow the user to press Escape keyboard key to go back.
3030
=== modified file 'qml/SearchPage.qml'
--- qml/SearchPage.qml 2016-04-10 15:45:29 +0000
+++ qml/SearchPage.qml 2016-04-14 16:55:42 +0000
@@ -390,7 +390,6 @@
390 if (model.title === i18n.tr("Nearby history")) {390 if (model.title === i18n.tr("Nearby history")) {
391 mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"),391 mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"),
392 {392 {
393 fromPage: searchPage,
394 lat: mainPageStack.currentLat,393 lat: mainPageStack.currentLat,
395 lng: mainPageStack.currentLng,394 lng: mainPageStack.currentLng,
396 poiType: model.name,395 poiType: model.name,
397396
=== modified file 'qml/SettingsPage.qml'
--- qml/SettingsPage.qml 2016-04-10 09:43:33 +0000
+++ qml/SettingsPage.qml 2016-04-14 16:55:42 +0000
@@ -306,7 +306,15 @@
306 Dialog {306 Dialog {
307 id: dialogueRadars307 id: dialogueRadars
308 title: i18n.tr("Speed Camera alerts and the law")308 title: i18n.tr("Speed Camera alerts and the law")
309 text: i18n.tr("uNav is only reading the OpenStreetMap database.\nuNav will show a max speed notification and a Speed Camera marker (marker hidden for French users because of law).\n\nIn a few countries Speed Camera alerts are illegal, then enable this option only if it's legal in the country.\n\nRead more about it here:\n%1").arg("http://goo.gl/ulXvG8")309 text: i18n.tr("uNav is only reading the OpenStreetMap database.\nuNav will show a max speed notification and a Speed Camera marker (marker hidden for French users because of law).\n\nIn a few countries Speed Camera alerts are illegal, then enable this option only if it's legal in the country.")
310 Label {
311 width: parent.width
312 color: UbuntuColors.slate
313 wrapMode: Text.WordWrap
314 horizontalAlignment: Text.AlignHCenter
315 text: i18n.tr("Read more about it %1.").arg("<a href=\"http://goo.gl/ulXvG8\">here</a>")
316 onLinkActivated: Qt.openUrlExternally(link)
317 }
310 Button {318 Button {
311 text: i18n.tr("OK")319 text: i18n.tr("OK")
312 color: UbuntuColors.red320 color: UbuntuColors.red
313321
=== modified file 'qml/tuto/Slide3.qml'
--- qml/tuto/Slide3.qml 2016-03-26 18:53:17 +0000
+++ qml/tuto/Slide3.qml 2016-04-14 16:55:42 +0000
@@ -40,7 +40,7 @@
40 elide: Text.ElideRight40 elide: Text.ElideRight
41 fontSize: "x-large"41 fontSize: "x-large"
42 maximumLineCount: 242 maximumLineCount: 2
43 text: i18n.tr("Flick Results")43 text: i18n.tr("Swipe Results")
44 horizontalAlignment: Text.AlignHCenter44 horizontalAlignment: Text.AlignHCenter
45 width: parent.width45 width: parent.width
46 wrapMode: Text.WordWrap46 wrapMode: Text.WordWrap
4747
=== modified file 'qml/tuto/components/Walkthrough.qml'
--- qml/tuto/components/Walkthrough.qml 2016-03-26 18:53:17 +0000
+++ qml/tuto/components/Walkthrough.qml 2016-04-14 16:55:42 +0000
@@ -42,10 +42,6 @@
42 // Property to signal walkthrough completion42 // Property to signal walkthrough completion
43 signal finished43 signal finished
4444
45 // Disable automatic orientation during welcome wizard since it is not landscape friendly yet.
46 // Component.onCompleted: podbird.automaticOrientation = false
47 // Component.onDestruction: podbird.automaticOrientation = true
48
49 header: PageHeader {45 header: PageHeader {
50 id: headerTuto46 id: headerTuto
51 visible: false47 visible: false
@@ -92,6 +88,7 @@
92 wrapMode: Text.WordWrap88 wrapMode: Text.WordWrap
93 text: i18n.tr("Skip")89 text: i18n.tr("Skip")
94 horizontalAlignment: Text.AlignRight90 horizontalAlignment: Text.AlignRight
91 visible: listView.currentIndex !== listView.count-1
9592
96 anchors {93 anchors {
97 top: parent.top94 top: parent.top

Subscribers

People subscribed via source and target branches