AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replaced loader with PageSetupWizardInstalling when updating container settings

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-12-01 14:16:27 +07:00
parent 3defb09da9
commit e619fd4af9
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/controllers/connectionController.cpp
View file

@ -110,6 +110,8 @@ void ConnectionController::onCurrentContainerUpdated()
if (m_isConnected || m_isConnectionInProgress) { if (m_isConnected || m_isConnectionInProgress) {
emit reconnectWithUpdatedContainer(tr("Settings updated successfully, Reconnnection...")); emit reconnectWithUpdatedContainer(tr("Settings updated successfully, Reconnnection..."));
openConnection(); openConnection();
} else {
emit reconnectWithUpdatedContainer(tr("Settings updated successfully"));
} }
} }

3
client/ui/qml/Pages2/PageProtocolAwgSettings.qml
View file

@ -312,9 +312,8 @@ PageType {
onClicked: { onClicked: {
forceActiveFocus() forceActiveFocus()
PageController.showBusyIndicator(true) PageController.goToPage(PageEnum.PageSetupWizardInstalling);
InstallController.updateContainer(AwgConfigModel.getConfig()) InstallController.updateContainer(AwgConfigModel.getConfig())
PageController.showBusyIndicator(false)
} }
} }
} }

5
client/ui/qml/Pages2/PageProtocolCloakSettings.qml
View file

@ -4,6 +4,8 @@ import QtQuick.Layouts
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
import PageEnum 1.0
import "./" import "./"
import "../Controls2" import "../Controls2"
import "../Controls2/TextTypes" import "../Controls2/TextTypes"
@ -160,9 +162,8 @@ PageType {
onClicked: { onClicked: {
forceActiveFocus() forceActiveFocus()
PageController.showBusyIndicator(true) PageController.goToPage(PageEnum.PageSetupWizardInstalling);
InstallController.updateContainer(CloakConfigModel.getConfig()) InstallController.updateContainer(CloakConfigModel.getConfig())
PageController.showBusyIndicator(false)
} }
} }
} }

3
client/ui/qml/Pages2/PageProtocolOpenVpnSettings.qml
View file

@ -390,9 +390,8 @@ PageType {
onClicked: { onClicked: {
forceActiveFocus() forceActiveFocus()
PageController.showBusyIndicator(true) PageController.goToPage(PageEnum.PageSetupWizardInstalling);
InstallController.updateContainer(OpenVpnConfigModel.getConfig()) InstallController.updateContainer(OpenVpnConfigModel.getConfig())
PageController.showBusyIndicator(false)
} }
} }
} }

5
client/ui/qml/Pages2/PageProtocolShadowSocksSettings.qml
View file

@ -4,6 +4,8 @@ import QtQuick.Layouts
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
import PageEnum 1.0
import "./" import "./"
import "../Controls2" import "../Controls2"
import "../Controls2/TextTypes" import "../Controls2/TextTypes"
@ -138,9 +140,8 @@ PageType {
onClicked: { onClicked: {
forceActiveFocus() forceActiveFocus()
PageController.showBusyIndicator(true) PageController.goToPage(PageEnum.PageSetupWizardInstalling);
InstallController.updateContainer(ShadowSocksConfigModel.getConfig()) InstallController.updateContainer(ShadowSocksConfigModel.getConfig())
PageController.showBusyIndicator(false)
} }
} }
} }

2
client/ui/qml/Pages2/PageStart.qml
View file

@ -100,6 +100,7 @@ PageType {
function onUpdateContainerFinished(message) { function onUpdateContainerFinished(message) {
PageController.showNotificationMessage(message) PageController.showNotificationMessage(message)
PageController.closePage()
} }
} }
@ -108,6 +109,7 @@ PageType {
function onReconnectWithUpdatedContainer(message) { function onReconnectWithUpdatedContainer(message) {
PageController.showNotificationMessage(message) PageController.showNotificationMessage(message)
PageController.closePage()
} }
} }