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 bugfix/split-tunneling

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-18 11:55:24 +05:00
commit 3340451245
12 changed files with 235 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -471,10 +471,16 @@ PageType {
}
checked: index === serversMenuContent.currentIndex
checkable: !ConnectionController.isConnected
ButtonGroup.group: serversRadioButtonGroup
onClicked: {
if (ConnectionController.isConnected) {
PageController.showNotificationMessage(qsTr("Unable change server while there is an active connection"))
return
}
serversMenuContent.currentIndex = index
ServersModel.currentlyProcessedIndex = index

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

@ -70,7 +70,7 @@ PageType {
Layout.margins: 16
text: qsTr("Auto start")
descriptionText: qsTr("Launch the application every time %1 starts").arg(Qt.platform.os)
descriptionText: qsTr("Launch the application every time the device is starts")
checked: SettingsController.isAutoStartEnabled()
onCheckedChanged: {

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

@ -94,7 +94,7 @@ PageType {
DividerType {}
LabelWithButtonType {
visible: !GC.isMobile()
visible: GC.isDesktop()
Layout.fillWidth: true
@ -108,11 +108,11 @@ PageType {
}
DividerType {
visible: !GC.isMobile()
visible: GC.isDesktop()
}
LabelWithButtonType {
visible: false//!GC.isMobile()
visible: false
Layout.fillWidth: true
@ -125,7 +125,7 @@ PageType {
}
DividerType {
visible: !GC.isMobile()
visible: false
}
}
}

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

@ -46,6 +46,7 @@ PageType {
}
ParagraphTextType {
Layout.fillWidth: true
text: qsTr("If AmneziaDNS is not used or installed")
}

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

@ -320,7 +320,7 @@ PageType {
if (index === ContainerProps.containerFromString("amnezia-openvpn")) {
root.connectionTypesModel.push(openVpnConnectionFormat)
} else if (index === ContainerProps.containerFromString("amnezia-awg")) {
} else if (index === ContainerProps.containerFromString("amnezia-wireguard")) {
root.connectionTypesModel.push(wireGuardConnectionFormat)
}
}