From a70e13082fd5134ab4fab99daf38366869e250b1 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 28 Aug 2020 13:31:26 -0400
Subject: [PATCH] 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 | 3 +++
src/mainview/MainView.qml | 30 +++++++++++++++---------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml
index ebfcbbfa8..784b13ef8 100644
--- a/src/MainApplicationWindow.qml
+++ b/src/MainApplicationWindow.qml
@@ -65,6 +65,7 @@ ApplicationWindow {
function onNoAccountIsAvailable() {
mainViewLoader.setSource("")
+ wizardViewForApplicationStart.changePageQML(0)
wizardView.show()
}
}
@@ -79,6 +80,8 @@ ApplicationWindow {
minimumHeight: 600
WizardView {
+ id: wizardViewForApplicationStart
+
anchors.fill: parent
onNeedToShowMainViewWindow: {
mainViewLoader.newAddedAccountIndex = accountIndex
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 5f50ed262..5b98007bc 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -227,26 +227,26 @@ Window {
}
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()
}
+ mainViewStackLayout.currentIndex = 0
+ }
- onWizardViewIsClosed: {
- mainViewStackLayout.currentIndex = 0
- }
+ onWizardViewIsClosed: {
+ mainViewStackLayout.currentIndex = 0
}
+ }
StackLayout {
id: mainViewStackLayout
--
GitLab