mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +07:00
d20ed4ad01
* change position view mode * remove `parentFlickable` from `PageShare` * replace `FlickableType` with `ListViewType` in `PageSettings` * reorganize `PageSettingsAbout` for improved structure * replace `Flickable` with `ListViewType` in drawer in `PageSettingsApiNativeConfigs` * replace `FlickableType` with `ListViewType` in `PageSettingsApplication` and update layout structure * replace `FlickableType` with `ListViewType` in `PageSettingsAppSplitTunneling` and adjust layout for better structure * replace `FlickableType` with `ListViewType` in `PageSettingsBackup` * replace `FlickableType` with `ListViewType` in `PageSettingsConnection` * replace `FlickableType` with `ListViewType` in `PageSettingsDns` * replace `FlickableType` with `ListViewType` in `PageSettingsLogging` * replace `FlickableType` with `ListViewType` in `PageSettingsServerData` * update structure of `PageSettingsServerProtocol` * update `PageSettingsServersList` * replace `ListView` with `ListViewType` in `PageSettingsSplitTunneling` * replace `FlickableType` with `ListViewType` in `PageServiceDnsSettings` * update `PageServiceSftpSettings` * update `PageServiceSocksProxySettings` * replace `FlickableType` with `ListViewType` in `PageServiceTorWebsiteSettings` * replace `FlickableType` with `ListViewType` in `PageSetupWizardApiServiceInfo` * update `PageSetupWizardApiServicesList` * replace `ListView` with `ListViewType` in `PageSetupWizardConfigSource` * replace `ListView` with `ListViewType` in `PageSetupWizardCredentials` * replace `FlickableType` with `ListViewType` in `PageSetupWizardEasy` * replace `FlickableType` with `ListViewType` in `PageSetupWizardInstalling` * replace `ListView` with `ListViewType` in `PageSetupWizardProtocols` * replace `FlickableType` with `ListViewType` in `PageSetupWizardProtocolSettings` * replace `FlickableType` with `ListViewType` in `PageSetupWizardTextKey` * replace `FlickableType` with `ListViewType` in `PageSetupWizardViewConfig` * update `PageProtocolAwgClientSettings` * update `PageProtocolAwgSettings` * replace `FlickableType` with `ListViewType` in `PageProtocolCloakSettings` * replace `FlickableType` with `ListViewType` in `PageProtocolRaw` * replace `FlickableType` with `ListViewType` in `PageProtocolShadowSocksSettings` * replace `FlickableType` with `ListViewType` in `PageProtocolWireGuardClientSettings` * replace `FlickableType` with `ListViewType` in `PageProtocolWireGuardSettings` * replace `FlickableType` with `ListViewType` in `PageProtocolXraySettings` * replace `FlickableType` with `ListViewType` in `PageShareFullAccess` * replace `FlickableType` with `ListViewType` in `PageDeinstalling` * update `PageDevMenu` * remove `Flickable` references in `LabelWithButtonType` * remove useless key navigation handlers from `ListViewType` * replace `ListView` with `ListViewType` in `ListViewWithRadioButtonType.qml` and remove unnecessary properties * remove references to `Flickable` in `TextAreaType.qml` * remove references to `Flickable` in `TextAreaWithFooterType` * remove references to `FlickableType` in `TextFieldWithHeaderType` * remove references to `FlickableType` in `SwitcherType` * remove references to `FlickableType` in `CheckBoxType` * remove references to `FlickableType` in `CardWithIconsType.qml` * remove references to `FlickableType` in `BasicButtonType.qml` * update `ServersListView` * update `SettingsContainersListView` * update `InstalledAppsDrawer` * update `SelectLanguageDrawer` * update `HomeContainersListView` * update `HomeSplitTunnelingDrawer` * fix `PageSetupWizardApiServicesList` --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com>
485 lines
14 KiB
QML
485 lines
14 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
import QtQuick.Dialogs
|
|
|
|
import QtCore
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ProtocolEnum 1.0
|
|
import ContainerProps 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
property var isServerFromTelegramApi: ServersModel.getDefaultServerData("isServerFromTelegramApi")
|
|
|
|
property bool pageEnabled
|
|
|
|
Component.onCompleted: {
|
|
if (ConnectionController.isConnected) {
|
|
PageController.showNotificationMessage(qsTr("Cannot change split tunneling settings during active connection"))
|
|
root.pageEnabled = false
|
|
} else if (ServersModel.isDefaultServerDefaultContainerHasSplitTunneling) {
|
|
PageController.showNotificationMessage(qsTr("Default server does not support split tunneling function"))
|
|
root.pageEnabled = false
|
|
} else {
|
|
root.pageEnabled = true
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: SitesController
|
|
|
|
function onFinished(message) {
|
|
PageController.showNotificationMessage(message)
|
|
}
|
|
|
|
function onErrorOccurred(errorMessage) {
|
|
PageController.showErrorMessage(errorMessage)
|
|
}
|
|
}
|
|
|
|
QtObject {
|
|
id: routeMode
|
|
property int allSites: 0
|
|
property int onlyForwardSites: 1
|
|
property int allExceptSites: 2
|
|
}
|
|
|
|
property list<QtObject> routeModesModel: [
|
|
onlyForwardSites,
|
|
allExceptSites
|
|
]
|
|
|
|
QtObject {
|
|
id: onlyForwardSites
|
|
property string name: qsTr("Only the sites listed here will be accessed through the VPN")
|
|
property int type: routeMode.onlyForwardSites
|
|
}
|
|
QtObject {
|
|
id: allExceptSites
|
|
property string name: qsTr("Addresses from the list should not be accessed via VPN")
|
|
property int type: routeMode.allExceptSites
|
|
}
|
|
|
|
function getRouteModesModelIndex() {
|
|
var currentRouteMode = SitesModel.routeMode
|
|
if ((routeMode.onlyForwardSites === currentRouteMode) || (routeMode.allSites === currentRouteMode)) {
|
|
return 0
|
|
} else if (routeMode.allExceptSites === currentRouteMode) {
|
|
return 1
|
|
}
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: header
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
anchors.topMargin: 20
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
}
|
|
|
|
HeaderTypeWithSwitcher {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
headerText: qsTr("Split tunneling")
|
|
|
|
enabled: root.pageEnabled
|
|
showSwitcher: true
|
|
switcher {
|
|
checked: SitesModel.isTunnelingEnabled
|
|
enabled: root.pageEnabled
|
|
}
|
|
switcherFunction: function(checked) {
|
|
SitesModel.toggleSplitTunneling(checked)
|
|
selector.text = root.routeModesModel[getRouteModesModelIndex()].name
|
|
}
|
|
}
|
|
|
|
DropDownType {
|
|
id: selector
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 32
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
drawerHeight: 0.4375
|
|
drawerParent: root
|
|
|
|
enabled: root.pageEnabled
|
|
|
|
headerText: qsTr("Mode")
|
|
|
|
listView: ListViewWithRadioButtonType {
|
|
rootWidth: root.width
|
|
|
|
model: root.routeModesModel
|
|
|
|
selectedIndex: getRouteModesModelIndex()
|
|
|
|
clickedFunction: function() {
|
|
selector.text = selectedText
|
|
selector.closeTriggered()
|
|
if (SitesModel.routeMode !== root.routeModesModel[selectedIndex].type) {
|
|
SitesModel.routeMode = root.routeModesModel[selectedIndex].type
|
|
}
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
if (root.routeModesModel[selectedIndex].type === SitesModel.routeMode) {
|
|
selector.text = selectedText
|
|
} else {
|
|
selector.text = root.routeModesModel[0].name
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: SitesModel
|
|
function onRouteModeChanged() {
|
|
selectedIndex = getRouteModesModelIndex()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ListViewType {
|
|
id: listView
|
|
|
|
anchors.top: header.bottom
|
|
anchors.topMargin: 16
|
|
anchors.bottom: addSiteButton.top
|
|
|
|
width: parent.width
|
|
|
|
enabled: root.pageEnabled
|
|
|
|
model: SortFilterProxyModel {
|
|
id: proxySitesModel
|
|
sourceModel: SitesModel
|
|
filters: [
|
|
AnyOf {
|
|
RegExpFilter {
|
|
roleName: "url"
|
|
pattern: ".*" + searchField.textField.text + ".*"
|
|
caseSensitivity: Qt.CaseInsensitive
|
|
}
|
|
RegExpFilter {
|
|
roleName: "ip"
|
|
pattern: ".*" + searchField.textField.text + ".*"
|
|
caseSensitivity: Qt.CaseInsensitive
|
|
}
|
|
}
|
|
]
|
|
}
|
|
|
|
delegate: ColumnLayout {
|
|
width: listView.width
|
|
|
|
LabelWithButtonType {
|
|
id: site
|
|
Layout.fillWidth: true
|
|
|
|
text: url
|
|
descriptionText: ip
|
|
rightImageSource: "qrc:/images/controls/trash.svg"
|
|
rightImageColor: AmneziaStyle.color.paleGray
|
|
|
|
clickedFunction: function() {
|
|
var headerText = qsTr("Remove ") + url + "?"
|
|
var yesButtonText = qsTr("Continue")
|
|
var noButtonText = qsTr("Cancel")
|
|
|
|
var yesButtonFunction = function() {
|
|
SitesController.removeSite(proxySitesModel.mapToSource(index))
|
|
if (!GC.isMobile()) {
|
|
site.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
var noButtonFunction = function() {
|
|
if (!GC.isMobile()) {
|
|
site.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
|
|
showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
|
|
Rectangle {
|
|
anchors.fill: addSiteButton
|
|
anchors.bottomMargin: -24
|
|
color: AmneziaStyle.color.midnightBlack
|
|
opacity: 0.8
|
|
}
|
|
|
|
RowLayout {
|
|
id: addSiteButton
|
|
|
|
enabled: root.pageEnabled
|
|
|
|
anchors.bottom: parent.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 24
|
|
anchors.rightMargin: 16
|
|
anchors.leftMargin: 16
|
|
anchors.bottomMargin: 24
|
|
|
|
TextFieldWithHeaderType {
|
|
id: searchField
|
|
|
|
Layout.fillWidth: true
|
|
rightButtonClickedOnEnter: true
|
|
|
|
textField.placeholderText: qsTr("website or IP")
|
|
buttonImageSource: "qrc:/images/controls/plus.svg"
|
|
|
|
clickedFunc: function() {
|
|
PageController.showBusyIndicator(true)
|
|
SitesController.addSite(textField.text)
|
|
textField.text = ""
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
}
|
|
|
|
ImageButtonType {
|
|
id: addSiteButtonImage
|
|
implicitWidth: 56
|
|
implicitHeight: 56
|
|
|
|
image: "qrc:/images/controls/more-vertical.svg"
|
|
imageColor: AmneziaStyle.color.paleGray
|
|
|
|
onClicked: function () {
|
|
moreActionsDrawer.openTriggered()
|
|
}
|
|
|
|
Keys.onReturnPressed: addSiteButtonImage.clicked()
|
|
Keys.onEnterPressed: addSiteButtonImage.clicked()
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: moreActionsDrawer
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.4375
|
|
|
|
expandedStateContent: ColumnLayout {
|
|
id: moreActionsDrawerContent
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
Header2Type {
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
headerText: qsTr("Additional options")
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: importSitesButton
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Import")
|
|
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
|
|
|
clickedFunction: function() {
|
|
importSitesDrawer.openTriggered()
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
|
|
LabelWithButtonType {
|
|
id: exportSitesButton
|
|
Layout.fillWidth: true
|
|
text: qsTr("Save site list")
|
|
|
|
clickedFunction: function() {
|
|
var fileName = ""
|
|
if (GC.isMobile()) {
|
|
fileName = "amnezia_sites.json"
|
|
} else {
|
|
fileName = SystemController.getFileName(qsTr("Save sites"),
|
|
qsTr("Sites files (*.json)"),
|
|
StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/amnezia_sites",
|
|
true,
|
|
".json")
|
|
}
|
|
if (fileName !== "") {
|
|
PageController.showBusyIndicator(true)
|
|
SitesController.exportSites(fileName)
|
|
moreActionsDrawer.closeTriggered()
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
|
|
LabelWithButtonType {
|
|
id: clearSitesButton
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Clear site list")
|
|
rightImageSource: "qrc:/images/controls/trash.svg"
|
|
|
|
clickedFunction: function() {
|
|
var headerText = qsTr("Clear site list?")
|
|
var descriptionText = qsTr("All sites will be removed from list.")
|
|
var yesButtonText = qsTr("Continue")
|
|
var noButtonText = qsTr("Cancel")
|
|
|
|
var yesButtonFunction = function() {
|
|
PageController.showBusyIndicator(true)
|
|
SitesController.removeSites()
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
var noButtonFunction = function() {
|
|
|
|
}
|
|
|
|
showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: importSitesDrawer
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.4375
|
|
|
|
expandedStateContent: Item {
|
|
implicitHeight: importSitesDrawer.expandedHeight
|
|
|
|
BackButtonType {
|
|
id: importSitesDrawerBackButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 16
|
|
|
|
backButtonFunction: function() {
|
|
importSitesDrawer.closeTriggered()
|
|
}
|
|
|
|
onFocusChanged: {
|
|
if (this.activeFocus) {
|
|
importSitesDrawerListView.positionViewAtBeginning()
|
|
}
|
|
}
|
|
}
|
|
|
|
ListViewType {
|
|
id: importSitesDrawerListView
|
|
|
|
anchors.top: importSitesDrawerBackButton.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
|
|
header: ColumnLayout {
|
|
width: importSitesDrawerListView.width
|
|
|
|
Header2Type {
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
headerText: qsTr("Import a list of sites")
|
|
}
|
|
}
|
|
|
|
model: importOptions
|
|
|
|
delegate: ColumnLayout {
|
|
width: importSitesDrawerListView.width
|
|
|
|
LabelWithButtonType {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
text: title
|
|
|
|
clickedFunction: function() {
|
|
clickedHandler()
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
property list<QtObject> importOptions: [
|
|
replaceOption,
|
|
addOption,
|
|
]
|
|
|
|
QtObject {
|
|
id: replaceOption
|
|
|
|
readonly property string title: qsTr("Replace site list")
|
|
readonly property var clickedHandler: function() {
|
|
var fileName = SystemController.getFileName(qsTr("Open sites file"),
|
|
qsTr("Sites files (*.json)"))
|
|
if (fileName !== "") {
|
|
root.importSites(fileName, true)
|
|
}
|
|
}
|
|
}
|
|
|
|
QtObject {
|
|
id: addOption
|
|
|
|
readonly property string title: qsTr("Add imported sites to existing ones")
|
|
readonly property var clickedHandler: function() {
|
|
var fileName = SystemController.getFileName(qsTr("Open sites file"),
|
|
qsTr("Sites files (*.json)"))
|
|
if (fileName !== "") {
|
|
root.importSites(fileName, false)
|
|
}
|
|
}
|
|
}
|
|
|
|
function importSites(fileName, replaceExistingSites) {
|
|
PageController.showBusyIndicator(true)
|
|
SitesController.importSites(fileName, replaceExistingSites)
|
|
PageController.showBusyIndicator(false)
|
|
importSitesDrawer.closeTriggered()
|
|
moreActionsDrawer.closeTriggered()
|
|
}
|
|
}
|