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

[Nekhelesh Ramananthan]

Just minor fixes

[lp:~nik90/unav/0.59-minor-fixes]

50. By Nekhelesh Ramananthan on 2016-04-14

minor fix

[Nekhelesh Ramananthan (nik90)]

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

[lp:~nik90/unav/0.59-minor-fixes]

51. By Nekhelesh Ramananthan on 2016-04-14

Fixed link not clickable in the warn radar dialog

[costales (costales)]

Nice touch :)

review: Approve

=== 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 @@
 
                         Action {
                             id: routeAction
-                            iconName: "send"
-                            text: i18n.tr("Route")
+                            iconName: "view-grid-symbolic"
+                            text: i18n.tr("Menu")
                             enabled: navigationPage.buttonsEnabled
                             onTriggered: {
                                 mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
@@ -383,7 +383,7 @@
                     opacity: navigationPage.buttonsEnabled ? 1.0 : 0.3
 
                     ActionIcon {
-                        icon.name: "send"
+                        icon.name: "view-grid-symbolic"
                         enabled: navigationPage.buttonsEnabled
                         onClicked: mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
                     }
@@ -487,7 +487,7 @@
                                 icon.height: units.gu(3)
                                 highlightSize: units.gu(-1)
                                 onClicked: {
-                                    mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Main.qml", "lat": mainPageStack.clickedLat, "lng": mainPageStack.clickedLng})
+                                    mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.clickedLat, "lng": mainPageStack.clickedLng})
                                 }
                             }
 

=== 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 @@
 
                 onClicked: {
                     if (model.mode === "CURRENT") {
-                        mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Nearby.qml", "lat": mainPageStack.currentLat, "lng": mainPageStack.currentLng})
+                        mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.currentLat, "lng": mainPageStack.currentLng})
                     } else if (model.mode === "DESTINATION") {
-                        mainPageStack.push(Qt.resolvedUrl("./PoiPage.qml"), {"fromPage": "Nearby.qml", "lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
+                        mainPageStack.push(Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.endLat, "lng": mainPageStack.endLng})
                     } else if (model.mode === "MAP") {
                         mainPageStack.clear(); // Show map
                         mainPageStack.executeJavaScript("force_show_map()");

=== 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 @@
 Page {
     id: poiListPage
 
-    property var fromPage
     property var lat
     property var lng
     property string poiType: ""

=== 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 @@
 Page {
     id: poiPage
 
-    property var fromPage
     property var lat
     property var lng
     property string unit: navApp.settings.unit === 0 ? "km" : "mi"
@@ -187,7 +186,6 @@
                 poiSearchField.text = ""
                 poiPage.header = standardHeader
                 mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"), {
-                    fromPage: poiPage,
                     lat: poiPage.lat,
                     lng: poiPage.lng,
                     poiType: model.label,

=== 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 @@
     id: routePage
 
     header: UNavHeader {
-        title: i18n.tr("Route")
+        title: i18n.tr("Menu")
         flickable: flickable
         
         // #FIXME: This back button is only here to allow the user to press Escape keyboard key to go back.

=== 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 @@
                     if (model.title === i18n.tr("Nearby history")) {
                         mainPageStack.push(Qt.resolvedUrl("PoiListPage.qml"),
                                            {
-                                               fromPage: searchPage,
                                                lat: mainPageStack.currentLat,
                                                lng: mainPageStack.currentLng,
                                                poiType: model.name,

=== 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 @@
             Dialog {
                 id: dialogueRadars
                 title: i18n.tr("Speed Camera alerts and the law")
-                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")
+                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.")
+                Label {
+                    width: parent.width
+                    color: UbuntuColors.slate
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: i18n.tr("Read more about it %1.").arg("<a href=\"http://goo.gl/ulXvG8\">here</a>")
+                    onLinkActivated: Qt.openUrlExternally(link)
+                }
                 Button {
                     text: i18n.tr("OK")
                     color: UbuntuColors.red

=== 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 @@
             elide: Text.ElideRight
             fontSize: "x-large"
             maximumLineCount: 2
-            text: i18n.tr("Flick Results")
+            text: i18n.tr("Swipe Results")
             horizontalAlignment: Text.AlignHCenter
             width: parent.width
             wrapMode: Text.WordWrap

=== 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 @@
     // Property to signal walkthrough completion
     signal finished
 
-    // Disable automatic orientation during welcome wizard since it is not landscape friendly yet.
-    // Component.onCompleted: podbird.automaticOrientation = false
-    // Component.onDestruction: podbird.automaticOrientation = true
-
     header: PageHeader {
         id: headerTuto
         visible: false
@@ -92,6 +88,7 @@
         wrapMode: Text.WordWrap
         text: i18n.tr("Skip")
         horizontalAlignment: Text.AlignRight
+        visible: listView.currentIndex !== listView.count-1
 
         anchors {
             top: parent.top