wizardview: manage through MainView

Change-Id: I083d293784e07f4fcc099e60ada84e433a1b2fa0
GitLab: #1216

src/app/AccountMigrationView.qml

@@ -35,9 +35,6 @@ BaseView {
 
     property bool successState: true
 
-    // signal to redirect the page to main view
-    signal loaderSourceChangeRequested(int sourceToLoad)
-
     function slotMigrationButtonClicked() {
         stackedWidget.currentIndex = AccountMigrationView.AccountMigrationStep.Synching;
         AccountAdapter.setArchivePasswordAsync(CurrentAccountToMigrate.accountId, passwordInputLineEdit.text);

src/app/MainApplicationWindow.qml

@@ -43,7 +43,6 @@ ApplicationWindow {
     LayoutMirroring.childrenInherit: isRTL
 
     enum LoadedSource {
-        WizardView,
         MainView,
         AccountMigrationView,
         None
@@ -95,19 +94,13 @@ ApplicationWindow {
 
     function checkLoadedSource() {
         var sourceString = mainApplicationLoader.source.toString();
-        if (sourceString === JamiQmlUtils.wizardViewLoadPath)
+        if (sourceString === JamiQmlUtils.mainViewLoadPath)
-            return MainApplicationWindow.LoadedSource.WizardView;
-        else if (sourceString === JamiQmlUtils.mainViewLoadPath)
             return MainApplicationWindow.LoadedSource.MainView;
         return MainApplicationWindow.LoadedSource.None;
     }
 
     function startClient() {
-        if (UtilsAdapter.getAccountListSize() !== 0) {
+        setMainLoaderSource(JamiQmlUtils.mainViewLoadPath);
-            setMainLoaderSource(JamiQmlUtils.mainViewLoadPath);
-        } else {
-            setMainLoaderSource(JamiQmlUtils.wizardViewLoadPath);
-        }
     }
 
     function setMainLoaderSource(source) {
@@ -159,14 +152,6 @@ ApplicationWindow {
         asynchronous: true
         visible: status == Loader.Ready
 
-        Connections {
-            target: viewCoordinator
-
-            function onRequestAppWindowWizardView() {
-                setMainLoaderSource(JamiQmlUtils.wizardViewLoadPath);
-            }
-        }
-
         Connections {
             id: connectionMigrationEnded
 
@@ -182,32 +167,16 @@ ApplicationWindow {
             }
         }
 
-        Connections {
-            target: mainApplicationLoader.item
-
-            function onLoaderSourceChangeRequested(sourceToLoad) {
-                if (sourceToLoad === MainApplicationWindow.LoadedSource.WizardView)
-                    setMainLoaderSource(JamiQmlUtils.wizardViewLoadPath);
-                else if (sourceToLoad === MainApplicationWindow.LoadedSource.AccountMigrationView)
-                    setMainLoaderSource(JamiQmlUtils.accountMigrationViewLoadPath);
-                else
-                    setMainLoaderSource(JamiQmlUtils.mainViewLoadPath);
-            }
-        }
-
         // Set `visible = false` when loading a new QML file.
         onSourceChanged: windowSettingsLoaded = false
 
         onLoaded: {
-            if (checkLoadedSource() === MainApplicationWindow.LoadedSource.WizardView) {
+            if (UtilsAdapter.getAccountListSize() === 0) {
-                // Onboarding wizard window, these settings are fixed.
+                layoutManager.restoreWindowSettings();
-                // - window screen will default to the primary
+                if (!viewCoordinator.rootView)
-                // - the window will showNormal once windowSettingsLoaded is
+                    // Set the viewCoordinator's root item.
-                //   set to true(then forcing visible to true)
+                    viewCoordinator.init(item);
-                appWindow.width = JamiTheme.wizardViewMinWidth;
+                viewCoordinator.present("WizardView");
-                appWindow.height = JamiTheme.wizardViewMinHeight;
-                appWindow.minimumWidth = JamiTheme.wizardViewMinWidth;
-                appWindow.minimumHeight = JamiTheme.wizardViewMinHeight;
             } else {
                 // Main window, load any valid app settings, and allow the
                 // layoutManager to handle as much as possible.
@@ -220,8 +189,9 @@ ApplicationWindow {
                         viewCoordinator.present("WelcomePage");
                         viewCoordinator.preload("ConversationView");
                     });
-                // Set the viewCoordinator's root item.
+                if (!viewCoordinator.rootView)
-                viewCoordinator.init(item);
+                    // Set the viewCoordinator's root item.
+                    viewCoordinator.init(item);
                 if (CurrentAccountToMigrate.accountToMigrateListSize > 0)
                     viewCoordinator.present("AccountMigrationView");
             }

src/app/ViewCoordinator.qml

@@ -27,7 +27,10 @@ QtObject {
     required property QtObject viewManager
 
     signal initialized
-    signal requestAppWindowWizardView
+
+    function requestAppWindowWizardView() {
+        viewCoordinator.present("WizardView");
+    }
 
     // A map of view names to file paths for QML files that define each view.
     property variant resources: {

src/app/mainview/MainView.qml

@@ -43,8 +43,6 @@ Rectangle {
     property int tabBarLeftMargin: 8
     property int tabButtonShrinkSize: 8
 
-    signal loaderSourceChangeRequested(int sourceToLoad)
-
     property string currentConvId: CurrentConversation.id
     onCurrentConvIdChanged: {
         if (currentConvId !== '') {

src/app/wizardview/WizardView.qml

@@ -33,9 +33,6 @@ BaseView {
 
     inhibits: ["ConversationView"]
 
-    // signal to redirect the page to main view
-    signal loaderSourceChangeRequested(int sourceToLoad)
-
     color: JamiTheme.backgroundColor
 
     Connections {
@@ -57,8 +54,11 @@ BaseView {
         target: WizardViewStepModel
 
         function onCloseWizardView() {
-            loaderSourceChangeRequested(MainApplicationWindow.LoadedSource.MainView);
             root.dismiss();
+            viewCoordinator.preload("SidePanel");
+            viewCoordinator.preload("SettingsSidePanel");
+            viewCoordinator.present("WelcomePage");
+            viewCoordinator.preload("ConversationView");
         }
     }
 
@@ -70,6 +70,7 @@ BaseView {
         anchors.fill: parent
 
         contentHeight: controlPanelStackView.height
+        boundsBehavior: Flickable.StopAtBounds
 
         StackLayout {
             id: controlPanelStackView