Added Accessible for main menu tabs and some PageSettings items

This commit is contained in:
vladimir.kuznetsov
2023-10-04 00:31:40 +05:00
parent 70e6a3d303
commit 6caf958bb3
4 changed files with 143 additions and 0 deletions

View File

@@ -0,0 +1,112 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Dialogs
import PageEnum 1.0
import "./"
import "../Controls2"
import "../Controls2/TextTypes"
import "../Config"
PageType {
id: root
FlickableType {
id: fl
anchors.top: parent.top
anchors.bottom: parent.bottom
contentHeight: content.height
ColumnLayout {
id: content
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
spacing: 0
HeaderType {
Layout.fillWidth: true
Layout.topMargin: 24
Layout.rightMargin: 16
Layout.leftMargin: 16
headerText: qsTr("Settings")
}
LabelWithButtonType {
Layout.fillWidth: true
Layout.topMargin: 16
text: qsTr("Servers")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
leftImageSource: "qrc:/images/controls/server.svg"
clickedFunction: function() {
PageController.goToPage(PageEnum.PageSettingsServersList)
}
}
DividerType {}
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Connection")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
leftImageSource: "qrc:/images/controls/radio.svg"
clickedFunction: function() {
PageController.goToPage(PageEnum.PageSettingsConnection)
}
}
DividerType {}
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Application")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
leftImageSource: "qrc:/images/controls/app.svg"
clickedFunction: function() {
PageController.goToPage(PageEnum.PageSettingsApplication)
}
}
DividerType {}
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("Backup")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
leftImageSource: "qrc:/images/controls/save.svg"
clickedFunction: function() {
PageController.goToPage(PageEnum.PageSettingsBackup)
}
}
DividerType {}
LabelWithButtonType {
Layout.fillWidth: true
text: qsTr("About AmneziaVPN")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
leftImageSource: "qrc:/images/controls/amnezia.svg"
clickedFunction: function() {
PageController.goToPage(PageEnum.PageSettingsAbout)
}
}
DividerType {}
}
}
}

View File

@@ -38,6 +38,9 @@ PageType {
}
LabelWithButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Servers settings button")
Layout.fillWidth: true
Layout.topMargin: 16
@@ -53,6 +56,9 @@ PageType {
DividerType {}
LabelWithButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Connections settings button")
Layout.fillWidth: true
text: qsTr("Connection")
@@ -67,6 +73,9 @@ PageType {
DividerType {}
LabelWithButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Application settings button")
Layout.fillWidth: true
text: qsTr("Application")
@@ -81,6 +90,9 @@ PageType {
DividerType {}
LabelWithButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Backup settings button")
Layout.fillWidth: true
text: qsTr("Backup")
@@ -95,6 +107,9 @@ PageType {
DividerType {}
LabelWithButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("About AmneziaVPN button")
Layout.fillWidth: true
text: qsTr("About AmneziaVPN")

View File

@@ -37,6 +37,9 @@ PageType {
actionButtonImage: "qrc:/images/controls/plus.svg"
headerText: qsTr("Servers")
Accessible.role: Accessible.ButtonMenu
Accessible.name: qsTr("Adding a new server")
Accessible.onPressAction: actionButtonFunction()
actionButtonFunction: function() {
connectionTypeSelection.visible = true
@@ -84,6 +87,10 @@ PageType {
id: server
Layout.fillWidth: true
Accessible.role: Accessible.ButtonMenu
Accessible.name: name + qsTr(" server settings")
Accessible.onPressAction: clickedFunction()
text: name
descriptionText: {
var servicesNameString = ""

View File

@@ -166,6 +166,9 @@ PageType {
}
TabImageButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Home button")
isSelected: tabBar.currentIndex === 0
image: "qrc:/images/controls/home.svg"
onClicked: {
@@ -176,6 +179,9 @@ PageType {
TabImageButtonType {
id: shareTabButton
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Share button")
Connections {
target: ServersModel
@@ -196,6 +202,9 @@ PageType {
}
}
TabImageButtonType {
Accessible.role: Accessible.ButtonMenuMenu
Accessible.name: qsTr("Settings button")
isSelected: tabBar.currentIndex === 2
image: "qrc:/images/controls/settings-2.svg"
onClicked: {