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

added disconnection from vpn when closing application for desktop

Browse source 
- many small ui fixes
This commit is contained in:
vladimir.kuznetsov 2023-08-16 12:11:34 +05:00
parent 14fa0b4fd3
commit e157160337
24 changed files with 121 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,6 +102,7 @@ PageType {
headerText: qsTr("Port")
textFieldText: port
textField.maximumLength: 5
textField.onEditingFinished: {
if (textFieldText !== port) {
@ -114,7 +115,6 @@ PageType {
id: cipherDropDown
Layout.fillWidth: true
Layout.topMargin: 16
implicitHeight: 74
descriptionText: qsTr("Cipher")
headerText: qsTr("Cipher")

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

@ -133,6 +133,7 @@ PageType {
headerText: qsTr("Port")
textFieldText: port
textField.maximumLength: 5
textField.onEditingFinished: {
if (textFieldText !== port) {
@ -161,7 +162,6 @@ PageType {
id: hashDropDown
Layout.fillWidth: true
Layout.topMargin: 20
implicitHeight: 74
enabled: !autoNegotiateEncryprionSwitcher.checked
@ -208,7 +208,6 @@ PageType {
id: cipherDropDown
Layout.fillWidth: true
Layout.topMargin: 16
implicitHeight: 74
enabled: !autoNegotiateEncryprionSwitcher.checked
@ -393,7 +392,7 @@ PageType {
}
}
}
}
}
}
QuestionDrawer {

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

@ -88,6 +88,7 @@ PageType {
headerText: qsTr("Port")
textFieldText: port
textField.maximumLength: 5
textField.onEditingFinished: {
if (textFieldText !== port) {
@ -100,7 +101,6 @@ PageType {
id: cipherDropDown
Layout.fillWidth: true
Layout.topMargin: 20
implicitHeight: 74
descriptionText: qsTr("Cipher")
headerText: qsTr("Cipher")

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

@ -50,6 +50,13 @@ PageType {
}
}
Connections {
target: SettingsController
function onChangeSettingsFinished(finishedMessage) {
PageController.showNotificationMessage(finishedMessage)
}
}
Connections {
target: ServersModel

15
client/ui/qml/Pages2/PageSettingsServerInfo.qml
View file

@ -18,6 +18,14 @@ import "../Components"
PageType {
id: root
Connections {
target: PageController
function onGoToPageSettingsServerServices() {
tabBar.currentIndex = 1
}
}
SortFilterProxyModel {
id: proxyServersModel
sourceModel: ServersModel
@ -99,13 +107,6 @@ PageType {
BasicButtonType {
Layout.fillWidth: true
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("Save")
onClicked: {

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

@ -107,6 +107,8 @@ PageType {
width: parent.width
visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
textColor: "#EB5757"

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

@ -20,13 +20,16 @@ PageType {
Connections {
target: InstallController
function onInstallContainerFinished(finishedMessage) {
function onInstallContainerFinished(finishedMessage, isServiceInstall) {
goToStartPage()
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
PageController.restorePageHomeState(true)
} else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
goToPage(PageEnum.PageSettingsServersList, false)
goToPage(PageEnum.PageSettingsServerInfo, false)
if (isServiceInstall) {
PageController.goToPageSettingsServerServices()
}
} else {
goToPage(PageEnum.PageHome)
}

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

@ -211,6 +211,7 @@ PageType {
Layout.topMargin: 16
headerText: qsTr("Port")
textField.maximumLength: 5
}
Rectangle {

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

@ -79,6 +79,7 @@ PageType {
Layout.fillWidth: true
text: ImportController.getConfigFileName()
wrapMode: Text.Wrap
}
}

15
client/ui/qml/Pages2/PageShare.qml
View file

@ -161,11 +161,9 @@ PageType {
Layout.fillWidth: true
Layout.topMargin: 24
implicitHeight: 74
drawerHeight: 0.4375
descriptionText: qsTr("Server and service")
descriptionText: accessTypeSelector.currentIndex === 0 ? qsTr("Server and service") : qsTr("Server")
headerText: qsTr("Server")
listView: ListViewType {
@ -261,7 +259,7 @@ PageType {
rootWidth: root.width
dividerVisible: true
imageSource: "qrc:/images/controls/chevron-right.svg"
imageSource: "qrc:/images/controls/check.svg"
model: SortFilterProxyModel {
id: proxyContainersModel
@ -327,13 +325,11 @@ PageType {
DropDownType {
id: exportTypeSelector
property int currentIndex
property int currentIndex: 0
Layout.fillWidth: true
Layout.topMargin: 16
implicitHeight: 74
drawerHeight: 0.4375
visible: accessTypeSelector.currentIndex === 0
@ -343,13 +339,15 @@ PageType {
headerText: qsTr("Connection format")
listView: ListViewType {
id: exportTypeListView
rootWidth: root.width
dividerVisible: true
imageSource: "qrc:/images/controls/chevron-right.svg"
model: root.connectionTypesModel
currentIndex: 0
currentIndex: exportTypeSelector.currentIndex
clickedFunction: function() {
exportTypeSelector.text = selectedText
@ -375,6 +373,7 @@ PageType {
enabled: shareButtonEnabled
text: qsTr("Share")
imageSource: "qrc:/images/controls/share-2.svg"
onClicked: {
if (accessTypeSelector.currentIndex === 0) {