Merge lp:~costales/unav/load-main-after-tuto into lp:unav

[costales]

In Nexus 4 rc-proposed the map is white after Tutorial.

[Nekhelesh Ramananthan (nik90)]

I was able to reproduce a case where the map is visible while viewing the nearby location list. Please apply the following patch to fix the bug,

=== modified file 'qml/Main.qml'
--- qml/Main.qml 2016-04-02 15:01:08 +0000
+++ qml/Main.qml 2016-04-02 15:50:21 +0000
@@ -80,7 +80,7 @@
     PageStack {
         id: mainPageStack

- Component.onCompleted: navApp.settings.showTuto ? mainPageStack.push(Qt.resolvedUrl("tuto/WelcomeWizard.qml")) : push(navigationPage)
+ Component.onCompleted: if (navApp.settings.showTuto) mainPageStack.push(Qt.resolvedUrl("tuto/WelcomeWizard.qml"))// : push(navigationPage)

         property string currentLat: "null"
         property string currentLng: "null"
@@ -111,7 +111,7 @@
         Page {
             id: navigationPage

- visible: mainPageStack.depth !== 1
+ visible: mainPageStack.depth === 0

             property bool buttonsEnabled: false

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

We can remove push(navigationPage) since it defined inside the pagestack and visible by default. The pages that need pushing to pagestack are only those ones that we push explicitly.

Please remove // push(navigationPage)

[Nekhelesh Ramananthan (nik90)]

LGTM!

review: Approve

=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-04-02 07:41:55 +0000
+++ qml/Main.qml	2016-04-02 16:02:32 +0000
@@ -45,7 +45,7 @@
     }
     
     anchorToKeyboard: true
-
+    
     width: units.gu(100)
     height: units.gu(70)
 
@@ -80,7 +80,7 @@
     PageStack {
         id: mainPageStack
 
-        Component.onCompleted: push(navigationPage)
+        Component.onCompleted: if (navApp.settings.showTuto) mainPageStack.push(Qt.resolvedUrl("tuto/WelcomeWizard.qml"))
         
         property string currentLat: "null"
         property string currentLng: "null"
@@ -110,9 +110,11 @@
 
         Page {
             id: navigationPage
-
+            
+            visible: mainPageStack.depth === 0
+            
             property bool buttonsEnabled: false
-
+            
             anchors.fill: parent
             
             header: PageHeader {
@@ -348,10 +350,6 @@
                             }
                             catch(e){}
                         }
-                        else if (navApp.settings.showTuto) {
-                            navApp.settings.showTuto = false;
-                            mainPageStack.push(Qt.resolvedUrl("tuto/WelcomeWizard.qml"));
-                        }
                     }
                 }
 

=== modified file 'qml/tuto/WelcomeWizard.qml'
--- qml/tuto/WelcomeWizard.qml	2016-03-26 18:53:17 +0000
+++ qml/tuto/WelcomeWizard.qml	2016-04-02 16:02:32 +0000
@@ -22,6 +22,7 @@
 Walkthrough {
     id: walkthrough
     onFinished: {
+        navApp.settings.showTuto = false;
         console.log("[LOG]: Welcome tour complete")
         mainPageStack.pop(walkthrough);
     }