Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into HEAD
This commit is contained in:
commit
c0aca97083
3 changed files with 20 additions and 1 deletions
|
|
@ -61,9 +61,24 @@ ListView {
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (checked) {
|
if (checked) {
|
||||||
|
var needReconnected = false
|
||||||
|
if (!isDefault) {
|
||||||
|
needReconnected = true
|
||||||
|
}
|
||||||
|
|
||||||
isDefault = true
|
isDefault = true
|
||||||
|
|
||||||
menuContent.currentIndex = index
|
menuContent.currentIndex = index
|
||||||
containersDropDown.menuVisible = false
|
containersDropDown.menuVisible = false
|
||||||
|
|
||||||
|
|
||||||
|
if (needReconnected &&
|
||||||
|
(ConnectionController.isConnected || ConnectionController.isConnectionInProgress)) {
|
||||||
|
PageController.showNotificationMessage(qsTr("Reconnect via VPN Procotol: ") + name)
|
||||||
|
PageController.goToPageHome()
|
||||||
|
menu.visible = false
|
||||||
|
ConnectionController.openConnection()
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
|
ContainersModel.setCurrentlyProcessedContainerIndex(proxyContainersModel.mapToSource(index))
|
||||||
InstallController.setShouldCreateServer(false)
|
InstallController.setShouldCreateServer(false)
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,6 @@ PageType {
|
||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: updateContainersModelFilters()
|
Component.onCompleted: updateContainersModelFilters()
|
||||||
currentIndex: ContainersModel.getDefaultContainer()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -218,6 +218,11 @@ PageType {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
anchors.fill: parent
|
||||||
|
acceptedButtons: Qt.NoButton
|
||||||
|
cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BasicButtonType {
|
BasicButtonType {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue