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

change Flickable to FlickableType for ClientManagement and ClientInfo pages

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-01-16 12:37:14 +03:00
parent 599910daea
commit 3f99c52349
3 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/ui/qml/Pages/ClientInfo/PageClientInfoOpenVPN.qml
View file

@ -28,26 +28,17 @@ PageClientInfoBase {
running: ClientInfoLogic.busyIndicatorIsRunning running: ClientInfoLogic.busyIndicatorIsRunning
} }
Flickable { FlickableType {
id: fl id: fl
width: root.width
anchors.top: caption.bottom anchors.top: caption.bottom
anchors.topMargin: 20
anchors.bottom: root.bottom
anchors.bottomMargin: 20
anchors.left: root.left
anchors.leftMargin: 30
anchors.right: root.right
anchors.rightMargin: 30
contentHeight: content.height contentHeight: content.height
clip: true
ColumnLayout { ColumnLayout {
id: content id: content
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: GC.defaultMargin
LabelType { LabelType {
enabled: !ClientInfoLogic.busyIndicatorIsRunning enabled: !ClientInfoLogic.busyIndicatorIsRunning

13
client/ui/qml/Pages/ClientInfo/PageClientInfoWireGuard.qml
View file

@ -28,26 +28,17 @@ PageClientInfoBase {
running: ClientInfoLogic.busyIndicatorIsRunning running: ClientInfoLogic.busyIndicatorIsRunning
} }
Flickable { FlickableType {
id: fl id: fl
width: root.width
anchors.top: caption.bottom anchors.top: caption.bottom
anchors.topMargin: 20
anchors.bottom: root.bottom
anchors.bottomMargin: 20
anchors.left: root.left
anchors.leftMargin: 30
anchors.right: root.right
anchors.rightMargin: 30
contentHeight: content.height contentHeight: content.height
clip: true
ColumnLayout { ColumnLayout {
id: content id: content
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: GC.defaultMargin
LabelType { LabelType {
enabled: !ClientInfoLogic.busyIndicatorIsRunning enabled: !ClientInfoLogic.busyIndicatorIsRunning

11
client/ui/qml/Pages/PageClientManagement.qml
View file

@ -31,16 +31,10 @@ PageBase {
running: ClientManagementLogic.busyIndicatorIsRunning running: ClientManagementLogic.busyIndicatorIsRunning
} }
Flickable { FlickableType {
id: fl id: fl
width: root.width
anchors.top: caption.bottom anchors.top: caption.bottom
anchors.topMargin: 20
anchors.bottom: root.bottom
anchors.bottomMargin: 20
contentHeight: content.height contentHeight: content.height
clip: true
Column { Column {
id: content id: content
@ -49,8 +43,9 @@ PageBase {
anchors.right: parent.right anchors.right: parent.right
LabelType { LabelType {
anchors.left: parent.left
font.pixelSize: 20 font.pixelSize: 20
leftPadding: -20
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: ClientManagementLogic.labelCurrentVpnProtocolText text: ClientManagementLogic.labelCurrentVpnProtocolText
} }