Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "added new drawer2type for replacing drawertype" #390

Merged
merged 1 commit into from
Oct 21, 2023
Merged

Revert "added new drawer2type for replacing drawertype" #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@
<file>ui/qml/Pages2/PageServiceDnsSettings.qml</file>
<file>ui/qml/Controls2/TopCloseButtonType.qml</file>
<file>images/controls/x-circle.svg</file>
<file>ui/qml/Controls2/Drawer2Type.qml</file>
<file>ui/qml/Pages2/PageProtocolAwgSettings.qml</file>
<file>server_scripts/awg/template.conf</file>
<file>server_scripts/awg/start.sh</file>
Expand Down
7 changes: 2 additions & 5 deletions client/ui/qml/Components/ConnectionTypeSelectionDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/ui/qml/Components/HomeContainersListView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
10 changes: 3 additions & 7 deletions client/ui/qml/Components/QuestionDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import QtQuick.Layouts
import "../Controls2"
import "../Controls2/TextTypes"

Drawer2Type {
DrawerType {
id: root

property string headerText
Expand All @@ -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
Expand All @@ -31,8 +29,6 @@ Drawer2Type {
anchors.rightMargin: 16
anchors.leftMargin: 16

// visible: false

spacing: 8

Header2TextType {
Expand Down
8 changes: 2 additions & 6 deletions client/ui/qml/Components/SelectLanguageDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -31,7 +28,6 @@ Drawer2Type {
}

FlickableType {
parent: root.contentParent
anchors.top: backButton.bottom
anchors.left: parent.left
anchors.right: parent.right
Expand Down
27 changes: 7 additions & 20 deletions client/ui/qml/Components/ShareConnectionDrawer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "../Controls2/TextTypes"
import "../Config"
import "../Components"

Drawer2Type {
DrawerType {
id: root

property alias headerText: header.headerText
Expand All @@ -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"
Expand All @@ -42,9 +41,6 @@ Drawer2Type {

Header2Type {
id: header

parent: root.contentParent

anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
Expand All @@ -54,8 +50,6 @@ Drawer2Type {
}

FlickableType {
parent: root.contentParent

anchors.top: header.bottom
anchors.bottom: parent.bottom
contentHeight: content.height + 32
Expand Down Expand Up @@ -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
Expand Down
Loading