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 feature/amnezia-wireguard-client-impl

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-10-09 23:19:48 +05:00
commit 0ce30a4e81
24 changed files with 107 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,7 +96,7 @@ PageType {
id: dragArea
anchors.fill: buttonBackground
cursorShape: Qt.PointingHandCursor
cursorShape: buttonContent.state === "collapsed" ? Qt.PointingHandCursor : Qt.ArrowCursor
hoverEnabled: true
drag.target: buttonContent
@ -385,18 +385,7 @@ PageType {
Layout.rightMargin: 16
visible: buttonContent.expandedVisibility
actionButtonImage: "qrc:/images/controls/plus.svg"
headerText: qsTr("Servers")
actionButtonFunction: function() {
buttonContent.state = "collapsed"
connectionTypeSelection.visible = true
}
}
ConnectionTypeSelectionDrawer {
id: connectionTypeSelection
}
}

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

@ -360,7 +360,7 @@ PageType {
onClicked: {
questionDrawer.headerText = qsTr("Remove OpenVpn from server?")
questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel")

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

@ -174,7 +174,7 @@ PageType {
clickedFunction: function() {
questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel")

14
client/ui/qml/Pages2/PageSettings.qml
View file

@ -107,6 +107,20 @@ PageType {
}
DividerType {}
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Close application")
leftImageSource: "qrc:/images/controls/x-circle.svg"
isLeftImageHoverEnabled: false
clickedFunction: function() {
PageController.closeApplication()
}
}
DividerType {}
}
}
}

4
client/ui/qml/Pages2/PageSettingsAbout.qml
View file

@ -68,8 +68,8 @@ PageType {
height: 20
font.pixelSize: 14
text: qsTr("This is a free and open source application. If you like it, support the developers with a donation.
And if you don't like the app, all the more support it - the donation will be used to improve the app.")
text: qsTr("This is a free and open source application. If you like it, support the developers with a donation. ") +
qsTr("And if you don’t like the application, all the more reason to support it - the donation will be used for the improving the application.")
color: "#CCCAC8"
}

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

@ -77,7 +77,7 @@ PageType {
Layout.fillWidth: true
Layout.topMargin: -12
text: qsTr("It will help you instantly restore connection settings at the next installation")
text: qsTr("You can save your settings to a backup file to restore them the next time you install the application.")
color: "#878B91"
}

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

@ -97,7 +97,7 @@ PageType {
Layout.fillWidth: true
text: qsTr("Split site tunneling")
descriptionText: qsTr("Allows you to connect to some sites through a secure connection, and to others bypassing it")
descriptionText: qsTr("Allows you to choose which sites you want to use the VPN for.")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
clickedFunction: function() {

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

@ -114,7 +114,7 @@ PageType {
clickedFunction: function() {
questionDrawer.headerText = qsTr("Remove %1 from server?").arg(ContainersModel.getCurrentlyProcessedContainerName())
questionDrawer.descriptionText = qsTr("All users with whom you shared a connection will no longer be able to connect to it")
questionDrawer.descriptionText = qsTr("All users who you shared a connection with will no longer be able to connect to it.")
questionDrawer.yesButtonText = qsTr("Continue")
questionDrawer.noButtonText = qsTr("Cancel")

10
client/ui/qml/Pages2/PageSettingsServersList.qml
View file

@ -34,20 +34,10 @@ PageType {
Layout.leftMargin: 16
Layout.rightMargin: 16
actionButtonImage: "qrc:/images/controls/plus.svg"
headerText: qsTr("Servers")
actionButtonFunction: function() {
connectionTypeSelection.visible = true
}
}
}
ConnectionTypeSelectionDrawer {
id: connectionTypeSelection
}
FlickableType {
anchors.top: header.bottom
anchors.topMargin: 16

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

@ -42,11 +42,7 @@ PageType {
function onInstallServerFinished(finishedMessage) {
PageController.goToStartPage()
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
PageController.restorePageHomeState()
} else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
PageController.goToPage(PageEnum.PageSettingsServersList, false)
} else {
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
PageController.replaceStartPage()
}

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

@ -25,11 +25,7 @@ PageType {
function onImportFinished() {
PageController.goToStartPage()
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
PageController.restorePageHomeState()
} else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
PageController.goToPage(PageEnum.PageSettingsServersList, false)
} else {
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSetupWizardStart)) {
PageController.replaceStartPage()
}
}

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

@ -187,7 +187,7 @@ PageType {
drawerHeight: 0.4375
descriptionText: qsTr("Servers")
descriptionText: qsTr("Server")
headerText: qsTr("Server")
listView: ListViewWithRadioButtonType {

35
client/ui/qml/Pages2/PageStart.qml
View file

@ -9,6 +9,7 @@ import "./"
import "../Controls2"
import "../Controls2/TextTypes"
import "../Config"
import "../Components"
PageType {
id: root
@ -17,14 +18,14 @@ PageType {
target: PageController
function onGoToPageHome() {
tabBar.currentIndex = 0
tabBar.setCurrentIndex(0)
tabBarStackView.goToTabBarPage(PageEnum.PageHome)
PageController.updateDrawerRootPage(PageEnum.PageHome)
}
function onGoToPageSettings() {
tabBar.currentIndex = 2
tabBar.setCurrentIndex(2)
tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
PageController.updateDrawerRootPage(PageEnum.PageSettings)
@ -70,6 +71,7 @@ PageType {
}
function onGoToStartPage() {
connectionTypeSelection.close()
while (tabBarStackView.depth > 1) {
tabBarStackView.pop()
}
@ -120,6 +122,8 @@ PageType {
height: root.height - tabBar.implicitHeight
function goToTabBarPage(page) {
connectionTypeSelection.close()
var pagePath = PageController.getPagePath(page)
tabBarStackView.clear(StackView.Immediate)
tabBarStackView.replace(pagePath, { "objectName" : pagePath }, StackView.Immediate)
@ -137,14 +141,16 @@ PageType {
TabBar {
id: tabBar
property int previousIndex: 0
anchors.right: parent.right
anchors.left: parent.left
anchors.bottom: parent.bottom
topPadding: 8
bottomPadding: 8
leftPadding: shareTabButton.visible ? 96 : 128
rightPadding: shareTabButton.visible ? 96 : 128
leftPadding: 96
rightPadding: 96
background: Shape {
width: parent.width
@ -171,8 +177,10 @@ PageType {
onClicked: {
tabBarStackView.goToTabBarPage(PageEnum.PageHome)
ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
tabBar.previousIndex = 0
}
}
TabImageButtonType {
id: shareTabButton
@ -193,13 +201,24 @@ PageType {
image: "qrc:/images/controls/share-2.svg"
onClicked: {
tabBarStackView.goToTabBarPage(PageEnum.PageShare)
tabBar.previousIndex = 1
}
}
TabImageButtonType {
isSelected: tabBar.currentIndex === 2
image: "qrc:/images/controls/settings-2.svg"
onClicked: {
tabBarStackView.goToTabBarPage(PageEnum.PageSettings)
tabBar.previousIndex = 2
}
}
TabImageButtonType {
isSelected: tabBar.currentIndex === 3
image: "qrc:/images/controls/plus.svg"
onClicked: {
connectionTypeSelection.open()
}
}
}
@ -215,4 +234,12 @@ PageType {
x: tabBarStackView.width - topCloseButton.width
z: 1
}
ConnectionTypeSelectionDrawer {
id: connectionTypeSelection
onAboutToHide: {
tabBar.setCurrentIndex(tabBar.previousIndex)
}
}
}