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

Merge branch 'dev' into feature/amnezia-wireguard-client-impl

Browse source
This commit is contained in:
pokamest 2023-10-06 14:22:45 +01:00
commit 135726f177
52 changed files with 4380 additions and 2197 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/ui/qml/Components/ConnectButton.qml
View file

@ -5,6 +5,7 @@ import QtQuick.Shapes
import Qt5Compat.GraphicalEffects
import ConnectionState 1.0
import PageEnum 1.0
Button {
id: root
@ -137,6 +138,15 @@ Button {
}
onClicked: {
if (!ContainersModel.isAnyContainerInstalled()) {
PageController.setTriggeredBtConnectButton(true)
ServersModel.currentlyProcessedIndex = ServersModel.getDefaultServerIndex()
PageController.goToPage(PageEnum.PageSetupWizardEasy)
return
}
if (ConnectionController.isConnectionInProgress) {
ConnectionController.closeConnection()
} else if (ConnectionController.isConnected) {

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

@ -114,7 +114,7 @@ DrawerType {
BasicButtonType {
Layout.fillWidth: true
Layout.topMargin: 8
Layout.topMargin: 24
defaultColor: "transparent"
hoveredColor: Qt.rgba(1, 1, 1, 0.08)
@ -123,7 +123,7 @@ DrawerType {
textColor: "#D7D8DB"
borderWidth: 1
text: qsTr("Show content")
text: qsTr("Show connection settings")
onClicked: {
configContentDrawer.visible = true