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

Merge branch 'dev' of github.com:amnezia-vpn/amnezia-client into HEAD

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-12-13 14:21:51 +07:00
commit a91ab0e910
12 changed files with 41 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ PageType {
property bool isTimerRunning: true
property string progressBarText: qsTr("Usually it takes no more than 5 minutes")
property bool isCancelButtonVisible: false
Connections {
target: InstallController
@ -61,11 +62,13 @@ PageType {
function onServerIsBusy(isBusy) {
if (isBusy) {
root.isCancelButtonVisible = true
root.progressBarText = qsTr("Amnezia has detected that your server is currently ") +
qsTr("busy installing other software. Amnezia installation ") +
qsTr("will pause until the server finishes installing other software")
root.isTimerRunning = false
} else {
root.isCancelButtonVisible = false
root.progressBarText = qsTr("Usually it takes no more than 5 minutes")
root.isTimerRunning = true
}
@ -150,6 +153,22 @@ PageType {
text: root.progressBarText
}
BasicButtonType {
id: cancelIntallationButton
Layout.fillWidth: true
Layout.topMargin: 24
visible: root.isCancelButtonVisible
text: qsTr("Cancel installation")
onClicked: {
InstallController.cancelInstallation()
PageController.showBusyIndicator(true)
}
}
}
}
}