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

moved vpnConnection to separate thread

Browse source 
- added tabbar blocking when installing/removing containers
This commit is contained in:
vladimir.kuznetsov 2023-08-09 18:17:29 +05:00
parent e0d93eaa9f
commit 591d98d8b6
14 changed files with 128 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,9 @@ import "../Config"
PageType {
id: root
Component.onCompleted: PageController.enableTabBar(false)
Component.onDestruction: PageController.enableTabBar(true)
SortFilterProxyModel {
id: proxyServersModel
sourceModel: ServersModel

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

@ -299,6 +299,12 @@ PageType {
checked: additionalClientCommands !== ""
text: qsTr("Additional client configuration commands")
onCheckedChanged: {
if (!checked) {
additionalClientCommands = ""
}
}
}
TextAreaType {

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

@ -21,7 +21,7 @@ PageType {
function onRestoreBackupFinished() {
PageController.showNotificationMessage(qsTr("Settings restored from backup file"))
goToStartPage()
//goToStartPage()
PageController.goToPageHome()
}
}

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

@ -166,7 +166,7 @@ PageType {
questionDrawer.visible = false
goToPage(PageEnum.PageDeinstalling)
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
ConnectionController.closeVpnConnection()
ConnectionController.closeConnection()
}
InstallController.removeAllContainers()
}

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

@ -14,6 +14,9 @@ import "../Config"
PageType {
id: root
Component.onCompleted: PageController.enableTabBar(false)
Component.onDestruction: PageController.enableTabBar(true)
Connections {
target: InstallController

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

@ -18,12 +18,12 @@ PageType {
function onGoToPageHome() {
tabBar.currentIndex = 0
tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageHome))
tabBarStackView.goToTabBarPage(PageEnum.PageHome)
}
function onGoToPageSettings() {
tabBar.currentIndex = 2
tabBarStackView.goToTabBarPage(PageController.getPagePath(PageEnum.PageSettings))
tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
}
function onGoToPageViewConfig() {
@ -37,6 +37,10 @@ PageType {
tabBar.enabled = !visible
}
function onEnableTabBar(enabled) {
tabBar.enabled = enabled
}
function onClosePage() {
if (tabBarStackView.depth <= 1) {
return