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

fixed display of notification about successful clearing of cached profiles

Browse source 
- limited the input for the Port field to only numeric values, in the range 1-65535
This commit is contained in:
vladimir.kuznetsov 2023-08-28 14:18:41 +03:00
parent fe08fd3f0a
commit 639c18395b
9 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Components/ShareConnectionDrawer.qml
View file

@ -227,7 +227,7 @@ DrawerType {
visible: ExportController.qrCodesCount > 0
horizontalAlignment: Text.AlignHCenter
text: qsTr("To read the QR code in the Amnezia app, select \"Add Server\" → \"I have connection details\"")
text: qsTr("To read the QR code in the Amnezia app, select \"Add server\" → \"I have data to connect\" → \"QR code, key or settings file\"")
}
}
}

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

@ -103,6 +103,7 @@ PageType {
headerText: qsTr("Port")
textFieldText: port
textField.maximumLength: 5
textField.validator: IntValidator { bottom: 1; top: 65535 }
textField.onEditingFinished: {
if (textFieldText !== port) {

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

@ -134,6 +134,7 @@ PageType {
headerText: qsTr("Port")
textFieldText: port
textField.maximumLength: 5
textField.validator: IntValidator { bottom: 1; top: 65535 }
textField.onEditingFinished: {
if (textFieldText !== port) {

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

@ -89,6 +89,7 @@ PageType {
headerText: qsTr("Port")
textFieldText: port
textField.maximumLength: 5
textField.validator: IntValidator { bottom: 1; top: 65535 }
textField.onEditingFinished: {
if (textFieldText !== port) {

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

@ -89,13 +89,15 @@ PageType {
clickedFunction: function() {
questionDrawer.headerText = qsTr("Clear cached profiles?")
questionDrawer.descriptionText = qsTr("some description")
questionDrawer.descriptionText = qsTr("")
questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel")
questionDrawer.yesButtonFunction = function() {
questionDrawer.visible = false
ContainersModel.clearCachedProfiles()
PageController.showBusyIndicator(true)
SettingsController.clearCachedProfiles()
PageController.showBusyIndicator(false)
}
questionDrawer.noButtonFunction = function() {
questionDrawer.visible = false
@ -165,7 +167,7 @@ PageType {
clickedFunction: function() {
questionDrawer.headerText = qsTr("Clear server from Amnezia software?")
questionDrawer.descriptionText = qsTr(" All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
questionDrawer.descriptionText = qsTr("All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted.")
questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel")

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

@ -49,7 +49,7 @@ PageType {
headerText: qsTr("Server connection")
descriptionText: qsTr("Do not use connection code from public sources. It may have been created to intercept your data.\n
It's okay if a friend passed the code.")
It's okay as long as it's from someone you trust.")
}
Header2TextType {

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

@ -107,31 +107,6 @@ PageType {
goToPage(PageEnum.PageSetupWizardEasy)
}
}
// 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
// text: qsTr("Select protocol to install")
// onClicked: function() {
// if (!isCredentialsFilled()) {
// return
// }
// InstallController.setShouldCreateServer(true)
// InstallController.setCurrentlyInstalledServerCredentials(hostname.textField.text, username.textField.text, secretData.textField.text)
// goToPage(PageEnum.PageSetupWizardProtocols)
// }
// }
}
}

13
client/ui/qml/Pages2/PageSetupWizardEasy.qml
View file

@ -45,7 +45,7 @@ PageType {
id: fl
anchors.top: backButton.bottom
anchors.bottom: parent.bottom
contentHeight: content.implicitHeight + continueButton.anchors.bottomMargin
contentHeight: content.implicitHeight + setupLaterButton.anchors.bottomMargin
Column {
id: content
@ -126,7 +126,9 @@ PageType {
}
}
DividerType {}
DividerType {
implicitWidth: parent.width
}
CardType {
implicitWidth: parent.width
@ -141,6 +143,11 @@ PageType {
}
}
Item {
implicitWidth: 1
implicitHeight: 1
}
BasicButtonType {
id: continueButton
@ -163,6 +170,8 @@ PageType {
}
BasicButtonType {
id: setupLaterButton
implicitWidth: parent.width
anchors.topMargin: 8
anchors.bottomMargin: 24

1
client/ui/qml/Pages2/PageSetupWizardProtocolSettings.qml
View file

@ -212,6 +212,7 @@ PageType {
headerText: qsTr("Port")
textField.maximumLength: 5
textField.validator: IntValidator { bottom: 1; top: 65535 }
}
Rectangle {