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

Revert "added new drawer2type for replacing drawertype"

Browse source
This commit is contained in:
pokamest 2023-10-21 14:17:45 +01:00 • committed by GitHub
parent 4551cf0a21
commit d98fdbdc5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 276 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
View file

@ -8,16 +8,13 @@ import "../Controls2"
import "../Controls2/TextTypes"
import "../Config"
Drawer2Type {
DrawerType {
id: root
width: parent.width
height: parent.height
contentHeight: parent.height * 0.4375
height: parent.height * 0.4375
ColumnLayout {
parent: root.contentParent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right

2
client/ui/qml/Components/HomeContainersListView.qml
View file

@ -63,7 +63,7 @@ ListView {
isDefault = true
menuContent.currentIndex = index
containersDropDown.menu.close()
containersDropDown.menuVisible = false
} else {
if (!isSupported && isInstalled) {
PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))

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

@ -5,7 +5,7 @@ import QtQuick.Layouts
import "../Controls2"
import "../Controls2/TextTypes"
Drawer2Type {
DrawerType {
id: root
property string headerText
@ -15,14 +15,12 @@ Drawer2Type {
property var yesButtonFunction
property var noButtonFunction
property real drawerHeight: 0.5
width: parent.width
height: parent.height
contentHeight: parent.height * drawerHeight
height: content.implicitHeight + 32
ColumnLayout {
parent: root.contentParent
id: content
anchors.top: parent.top
anchors.left: parent.left
@ -31,8 +29,6 @@ Drawer2Type {
anchors.rightMargin: 16
anchors.leftMargin: 16
// visible: false
spacing: 8
Header2TextType {

8
client/ui/qml/Components/SelectLanguageDrawer.qml
View file

@ -5,18 +5,15 @@ import QtQuick.Layouts
import "../Controls2"
import "../Controls2/TextTypes"
Drawer2Type {
DrawerType {
id: root
width: parent.width
height: parent.height
contentHeight: parent.height * 0.9
height: parent.height * 0.9
ColumnLayout {
id: backButton
parent: root.contentParent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
@ -31,7 +28,6 @@ Drawer2Type {
}
FlickableType {
parent: root.contentParent
anchors.top: backButton.bottom
anchors.left: parent.left
anchors.right: parent.right

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

@ -16,7 +16,7 @@ import "../Controls2/TextTypes"
import "../Config"
import "../Components"
Drawer2Type {
DrawerType {
id: root
property alias headerText: header.headerText
@ -28,10 +28,9 @@ Drawer2Type {
property string configFileName: "amnezia_config.vpn"
width: parent.width
height: parent.height
contentHeight: parent.height * 0.9
height: parent.height * 0.9
onDrawerClosed: {
onClosed: {
configExtension = ".vpn"
configCaption = qsTr("Save AmneziaVPN config")
configFileName = "amnezia_config"
@ -42,9 +41,6 @@ Drawer2Type {
Header2Type {
id: header
parent: root.contentParent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
@ -54,8 +50,6 @@ Drawer2Type {
}
FlickableType {
parent: root.contentParent
anchors.top: header.bottom
anchors.bottom: parent.bottom
contentHeight: content.height + 32
@ -132,37 +126,30 @@ Drawer2Type {
text: qsTr("Show connection settings")
onClicked: {
configContentDrawer.open()
configContentDrawer.visible = true
}
}
Drawer2Type {
DrawerType {
id: configContentDrawer
parent: root
width: parent.width
height: parent.height
contentHeight: parent.height * 0.9
height: parent.height * 0.9
BackButtonType {
id: backButton
parent: configContentDrawer.contentParent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.topMargin: 16
backButtonFunction: function() {
configContentDrawer.close()
configContentDrawer.visible = false
}
}
FlickableType {
parent: configContentDrawer.contentParent
anchors.top: backButton.bottom
anchors.left: parent.left
anchors.right: parent.right