From e619fd4af9584e3e36deb52e7dd78590f47b213a Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 1 Dec 2023 14:16:27 +0700
Subject: [PATCH] replaced loader with PageSetupWizardInstalling when updating
 container settings

---
 client/ui/controllers/connectionController.cpp           | 2 ++
 client/ui/qml/Pages2/PageProtocolAwgSettings.qml         | 3 +--
 client/ui/qml/Pages2/PageProtocolCloakSettings.qml       | 5 +++--
 client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml     | 3 +--
 client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml | 5 +++--
 client/ui/qml/Pages2/PageStart.qml                       | 2 ++
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/ui/controllers/connectionController.cpp b/client/ui/controllers/connectionController.cpp
index 74438dcc..b8004d09 100644
--- a/client/ui/controllers/connectionController.cpp
+++ b/client/ui/controllers/connectionController.cpp
@@ -110,6 +110,8 @@ void ConnectionController::onCurrentContainerUpdated()
     if (m_isConnected || m_isConnectionInProgress) {
         emit reconnectWithUpdatedContainer(tr("Settings updated successfully, Reconnnection..."));
         openConnection();
+    } else {
+        emit reconnectWithUpdatedContainer(tr("Settings updated successfully"));
     }
 }
 
diff --git a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
index 237a8b46..a4f5abe3 100644
--- a/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolAwgSettings.qml
@@ -312,9 +312,8 @@ PageType {
 
                             onClicked: {
                                 forceActiveFocus()
-                                PageController.showBusyIndicator(true)
+                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                 InstallController.updateContainer(AwgConfigModel.getConfig())
-                                PageController.showBusyIndicator(false)
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
index 78e666a7..98e9c28f 100644
--- a/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolCloakSettings.qml
@@ -4,6 +4,8 @@ import QtQuick.Layouts
 
 import SortFilterProxyModel 0.2
 
+import PageEnum 1.0
+
 import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
@@ -160,9 +162,8 @@ PageType {
 
                             onClicked: {
                                 forceActiveFocus()
-                                PageController.showBusyIndicator(true)
+                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                 InstallController.updateContainer(CloakConfigModel.getConfig())
-                                PageController.showBusyIndicator(false)
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
index 55cdcf04..971f9f39 100644
--- a/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
@@ -390,9 +390,8 @@ PageType {
 
                             onClicked: {
                                 forceActiveFocus()
-                                PageController.showBusyIndicator(true)
+                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                 InstallController.updateContainer(OpenVpnConfigModel.getConfig())
-                                PageController.showBusyIndicator(false)
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
index 2453281f..573aca06 100644
--- a/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
@@ -4,6 +4,8 @@ import QtQuick.Layouts
 
 import SortFilterProxyModel 0.2
 
+import PageEnum 1.0
+
 import "./"
 import "../Controls2"
 import "../Controls2/TextTypes"
@@ -138,9 +140,8 @@ PageType {
 
                             onClicked: {
                                 forceActiveFocus()
-                                PageController.showBusyIndicator(true)
+                                PageController.goToPage(PageEnum.PageSetupWizardInstalling);
                                 InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
-                                PageController.showBusyIndicator(false)
                             }
                         }
                     }
diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml
index c92bdb8f..3afdf73a 100644
--- a/client/ui/qml/Pages2/PageStart.qml
+++ b/client/ui/qml/Pages2/PageStart.qml
@@ -100,6 +100,7 @@ PageType {
 
         function onUpdateContainerFinished(message) {
             PageController.showNotificationMessage(message)
+            PageController.closePage()
         }
     }
 
@@ -108,6 +109,7 @@ PageType {
 
         function onReconnectWithUpdatedContainer(message) {
             PageController.showNotificationMessage(message)
+            PageController.closePage()
         }
     }