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

added server availability check after entering credentials

Browse source 
- moved the protocol self-selection button to the PageSetupWizardEasy page
This commit is contained in:
vladimir.kuznetsov 2023-07-31 20:38:13 +09:00
parent aa66133813
commit 0058edc24e
21 changed files with 1002 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

47
client/ui/qml/Pages2/PageSetupWizardCredentials.qml
View file

@ -94,7 +94,7 @@ PageType {
Layout.fillWidth: true
Layout.topMargin: 24
text: qsTr("Set up a server the easy way")
text: qsTr("Continue")
onClicked: function() {
if (!isCredentialsFilled()) {
@ -104,34 +104,41 @@ PageType {
InstallController.setShouldCreateServer(true)
InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
PageController.showBusyIndicator(true)
var isConnectionOpened = InstallController.checkSshConnection()
PageController.showBusyIndicator(false)
if (!isConnectionOpened) {
return
}
goToPage(PageEnum.PageSetupWizardEasy)
}
}
BasicButtonType {
Layout.fillWidth: true
Layout.topMargin: -8
// BasicButtonType {
// Layout.fillWidth: true
// Layout.topMargin: -8
defaultColor: "transparent"
hoveredColor: Qt.rgba(1, 1, 1, 0.08)
pressedColor: Qt.rgba(1, 1, 1, 0.12)
disabledColor: "#878B91"
textColor: "#D7D8DB"
borderWidth: 1
// defaultColor: "transparent"
// hoveredColor: Qt.rgba(1, 1, 1, 0.08)
// pressedColor: Qt.rgba(1, 1, 1, 0.12)
// disabledColor: "#878B91"
// textColor: "#D7D8DB"
// borderWidth: 1
text: qsTr("Select protocol to install")
// text: qsTr("Select protocol to install")
onClicked: function() {
if (!isCredentialsFilled()) {
return
}
// onClicked: function() {
// if (!isCredentialsFilled()) {
// return
// }
InstallController.setShouldCreateServer(true)
InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
// InstallController.setShouldCreateServer(true)
// InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
goToPage(PageEnum.PageSetupWizardProtocols)
}
}
// goToPage(PageEnum.PageSetupWizardProtocols)
// }
// }
}
}