commit a70e13082fd5134ab4fab99daf38366869e250b1
author Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com> Fri Aug 28 13:31:26 2020 -0400
committer Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com> Fri Aug 28 13:31:26 2020 -0400
tree fefba1508d6d6bc7078d6c72eb4f3fc55b27d297
parent b07f7afe9221f671535400e8a20c6795dd432fd9

wizardview: temporary fix for page arrangement when deleting the last account

When deleting the last account, wizard view's page can be incorrect
if the user has created an account before.

Gitlab: #43
Change-Id: I82055456a9df608d88b81fc51049b0623c6d0a35

src/MainApplicationWindow.qml

diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml
index ebfcbbf..784b13e 100644
--- a/src/MainApplicationWindow.qml
+++ b/src/MainApplicationWindow.qml
@@ -65,6 +65,7 @@
 
             function onNoAccountIsAvailable() {
                 mainViewLoader.setSource("")
+                wizardViewForApplicationStart.changePageQML(0)
                 wizardView.show()
             }
         }
@@ -79,6 +80,8 @@
         minimumHeight: 600
 
         WizardView {
+            id: wizardViewForApplicationStart
+
             anchors.fill: parent
             onNeedToShowMainViewWindow: {
                 mainViewLoader.newAddedAccountIndex = accountIndex

src/mainview/MainView.qml

diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 5f50ed2..5b98007 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -227,27 +227,27 @@
     }
 
     WizardView {
-            id: wizardView
+        id: wizardView
 
-            anchors.fill: parent
+        anchors.fill: parent
 
-            onNeedToShowMainViewWindow: {
-                mainViewLoader.newAddedAccountIndex = accountIndex
-                if (mainViewLoader.source.toString() !== "qrc:/src/mainview/MainView.qml") {
-                    mainViewLoader.loaded.disconnect(slotNewAccountAdded)
-                    mainViewLoader.loaded.connect(slotNewAccountAdded)
-                    mainViewLoader.setSource("qrc:/src/mainview/MainView.qml")
-                } else {
-                    slotNewAccountAdded()
-                }
-                mainViewStackLayout.currentIndex = 0
+        onNeedToShowMainViewWindow: {
+            mainViewLoader.newAddedAccountIndex = accountIndex
+            if (mainViewLoader.source.toString() !== "qrc:/src/mainview/MainView.qml") {
+                mainViewLoader.loaded.disconnect(slotNewAccountAdded)
+                mainViewLoader.loaded.connect(slotNewAccountAdded)
+                mainViewLoader.setSource("qrc:/src/mainview/MainView.qml")
+            } else {
+                slotNewAccountAdded()
             }
-
-            onWizardViewIsClosed: {
-                mainViewStackLayout.currentIndex = 0
-            }
+            mainViewStackLayout.currentIndex = 0
         }
 
+        onWizardViewIsClosed: {
+            mainViewStackLayout.currentIndex = 0
+        }
+    }
+
     StackLayout {
         id: mainViewStackLayout