* refactoring: improved the performance of secure_settings * bugfix: fixed textFields on PageSetupWizardCredentials * bugfix: fixed scrolling by keys on PageSettingsApiServerInfo * chore: hide site links for ios (#1374) * chore: fixed log output with split tunneling info * chore: hide "open logs folder" button for mobule platforms * chore: fixed again log output with split tunneling info * chore: bump version * Install apparmor (#1379) Install apparmor * chore: returned the backup page for androidTV * Enable PFS for Windows IKEv2 * refactoring: moved api info pages from ServerInfo * refactoring: moved gateway interaction functions to a separate class * bugfix: fixed storeEndpoint parsing * chore: returned links for mobile platforms * Update VPN protocol descriptions * Update VPN description texts * feature: added pages for subscription settings feature * feature: added page for export api native configs * feature: added error handling and minor ui fixes * refactor: update ios build configuration to use automatic code signing and prebuilt OpenVPNAdapter framework * feat: remove OpenVPNAdapter submodule * feat: remove ios openvpn script and associated cmake configuration * Update README.md * Update README_RU.md * Update README.md fix link * feature: added share vpn key to subscription settings page * bugfix: fixed possible crush on android * add timeouts in ipc client init * apply timeouts only for Windows * apply format to file * refactoring: simplified the validity check of the config before connection - improved project structure * bugfix: fixed visability of share drawer * feature: added 409 error handling from server response * chore: fixed android build * chore: fixed qr code display * Rewrite timeouts using waitForSource * feature: added error messages handler * feature: added issued configs info parsing * feature: added functionality to revoke api configs * chore: added links to instructions * chore: fixed qr code with vpnkey processing * chore: fixed native config post processing * chore: added link to android tv instruction * change node to IpcProcessTun2SocksReplica * chore: minor ui fixes * Update Windows OpenSSL (#1426) * Update Windows OpenSSL to 3.0.16 and add shared library for QSslSocket plugin * chore: update link to submodule 3rd-prebuild --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> * chore: added 404 handling for revoke configs - added revoke before remove api server for premium v2 * chore: added log to see proxy decrypt errors * chore: minor ui fix * chore: bump version * bugfix: fixed mobile controllers initialization (#1436) * bugfix: fixed mobile controllers initialization * chore: bump version * Merge pull request #1440 from amnezia-vpn/feature/subscription-settings-page feature/subscription settings page --------- Co-authored-by: vladimir.kuznetsov <nethiuswork@gmail.com> Co-authored-by: pokamest <pokamest@gmail.com> Co-authored-by: Mykola Baibuz <mykola.baibuz@gmail.com> Co-authored-by: Yaroslav Yashin <yaroslav.yashin@gmail.com> Co-authored-by: KsZnak <ksu@amnezia.org> Co-authored-by: Cyril Anisimov <CyAn84@gmail.com>
284 lines
11 KiB
QML
284 lines
11 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ContainerProps 1.0
|
|
import ProtocolProps 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
SortFilterProxyModel {
|
|
id: proxyContainersModel
|
|
sourceModel: ContainersModel
|
|
filters: [
|
|
ValueFilter {
|
|
roleName: "isCurrentlyProcessed"
|
|
value: true
|
|
}
|
|
]
|
|
}
|
|
|
|
FlickableType {
|
|
anchors.fill: parent
|
|
contentHeight: content.height
|
|
|
|
Column {
|
|
id: content
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
ListView {
|
|
id: processedContainerListView
|
|
width: parent.width
|
|
height: contentItem.height
|
|
currentIndex: -1
|
|
clip: true
|
|
interactive: false
|
|
model: proxyContainersModel
|
|
|
|
property bool isFocusable: true
|
|
|
|
Keys.onTabPressed: {
|
|
FocusController.nextKeyTabItem()
|
|
}
|
|
|
|
Keys.onBacktabPressed: {
|
|
FocusController.previousKeyTabItem()
|
|
}
|
|
|
|
Keys.onUpPressed: {
|
|
FocusController.nextKeyUpItem()
|
|
}
|
|
|
|
Keys.onDownPressed: {
|
|
FocusController.nextKeyDownItem()
|
|
}
|
|
|
|
Keys.onLeftPressed: {
|
|
FocusController.nextKeyLeftItem()
|
|
}
|
|
|
|
Keys.onRightPressed: {
|
|
FocusController.nextKeyRightItem()
|
|
}
|
|
|
|
delegate: Item {
|
|
implicitWidth: processedContainerListView.width
|
|
implicitHeight: (delegateContent.implicitHeight > root.height) ? delegateContent.implicitHeight : root.height
|
|
|
|
property alias port:port
|
|
|
|
ColumnLayout {
|
|
id: delegateContent
|
|
|
|
anchors.fill: parent
|
|
anchors.rightMargin: 16
|
|
anchors.leftMargin: 16
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
|
|
Layout.topMargin: 20
|
|
Layout.rightMargin: -16
|
|
Layout.leftMargin: -16
|
|
}
|
|
|
|
HeaderType {
|
|
id: header
|
|
|
|
Layout.fillWidth: true
|
|
|
|
headerText: qsTr("Installing %1").arg(name)
|
|
descriptionText: description
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: showDetailsButton
|
|
|
|
Layout.topMargin: 16
|
|
Layout.leftMargin: -8
|
|
|
|
implicitHeight: 32
|
|
|
|
defaultColor: AmneziaStyle.color.transparent
|
|
hoveredColor: AmneziaStyle.color.translucentWhite
|
|
pressedColor: AmneziaStyle.color.sheerWhite
|
|
disabledColor: AmneziaStyle.color.mutedGray
|
|
textColor: AmneziaStyle.color.goldenApricot
|
|
|
|
text: qsTr("More detailed")
|
|
KeyNavigation.tab: transportProtoSelector
|
|
|
|
clickedFunc: function() {
|
|
showDetailsDrawer.openTriggered()
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: showDetailsDrawer
|
|
parent: root
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.9
|
|
expandedStateContent: Item {
|
|
implicitHeight: showDetailsDrawer.expandedHeight
|
|
|
|
BackButtonType {
|
|
id: showDetailsBackButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 16
|
|
|
|
backButtonFunction: function() {
|
|
showDetailsDrawer.closeTriggered()
|
|
}
|
|
}
|
|
|
|
FlickableType {
|
|
id: fl
|
|
anchors.top: showDetailsBackButton.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
contentHeight: {
|
|
var emptySpaceHeight = parent.height - showDetailsBackButton.implicitHeight - showDetailsBackButton.anchors.topMargin
|
|
return (showDetailsDrawerContent.height > emptySpaceHeight) ?
|
|
showDetailsDrawerContent.height : emptySpaceHeight
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: showDetailsDrawerContent
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.rightMargin: 16
|
|
anchors.leftMargin: 16
|
|
|
|
Header2Type {
|
|
id: showDetailsDrawerHeader
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
|
|
headerText: name
|
|
}
|
|
|
|
ParagraphTextType {
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
Layout.bottomMargin: 16
|
|
|
|
text: detailedDescription
|
|
textFormat: Text.MarkdownText
|
|
}
|
|
|
|
Rectangle {
|
|
Layout.fillHeight: true
|
|
color: AmneziaStyle.color.transparent
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: showDetailsCloseButton
|
|
Layout.fillWidth: true
|
|
Layout.bottomMargin: 32
|
|
parentFlickable: fl
|
|
|
|
text: qsTr("Close")
|
|
|
|
clickedFunc: function() {
|
|
showDetailsDrawer.closeTriggered()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ParagraphTextType {
|
|
id: transportProtoHeader
|
|
|
|
Layout.topMargin: 16
|
|
|
|
text: qsTr("Network protocol")
|
|
}
|
|
|
|
TransportProtoSelector {
|
|
id: transportProtoSelector
|
|
|
|
Layout.fillWidth: true
|
|
rootWidth: root.width
|
|
}
|
|
|
|
TextFieldWithHeaderType {
|
|
id: port
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 16
|
|
|
|
headerText: qsTr("Port")
|
|
textField.maximumLength: 5
|
|
textField.validator: IntValidator { bottom: 1; top: 65535 }
|
|
}
|
|
|
|
Rectangle {
|
|
Layout.fillHeight: true
|
|
color: AmneziaStyle.color.transparent
|
|
}
|
|
|
|
BasicButtonType {
|
|
id: installButton
|
|
|
|
Layout.fillWidth: true
|
|
Layout.bottomMargin: 32
|
|
|
|
text: qsTr("Install")
|
|
|
|
clickedFunc: function() {
|
|
if (!port.textField.acceptableInput &&
|
|
ContainerProps.containerTypeToString(dockerContainer) !== "torwebsite" &&
|
|
ContainerProps.containerTypeToString(dockerContainer) !== "ikev2") {
|
|
port.errorText = qsTr("The port must be in the range of 1 to 65535")
|
|
return
|
|
}
|
|
|
|
PageController.goToPage(PageEnum.PageSetupWizardInstalling);
|
|
InstallController.install(dockerContainer, port.textField.text, transportProtoSelector.currentIndex)
|
|
}
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
var defaultContainerProto = ContainerProps.defaultProtocol(dockerContainer)
|
|
|
|
if (ProtocolProps.defaultPort(defaultContainerProto) < 0) {
|
|
port.visible = false
|
|
} else {
|
|
port.textField.text = ProtocolProps.getPortForInstall(defaultContainerProto)
|
|
}
|
|
transportProtoSelector.currentIndex = ProtocolProps.defaultTransportProto(defaultContainerProto)
|
|
|
|
port.enabled = ProtocolProps.defaultPortChangeable(defaultContainerProto)
|
|
var protocolSelectorVisible = ProtocolProps.defaultTransportProtoChangeable(defaultContainerProto)
|
|
transportProtoSelector.visible = protocolSelectorVisible
|
|
transportProtoHeader.visible = protocolSelectorVisible
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|