Skip to content

feat(at-spi): add accessible names for QML interactive controls #797

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

Draft
MyLeeJiEun wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(at-spi): add accessible names for QML interactive controls #797

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
6 changes: 6 additions & 0 deletions REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,9 @@ path = "toolGenerate/**/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "None"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = "tests/at/spi/expected_names.yaml"
precedence = "aggregate"
SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd."
SPDX-License-Identifier = "CC0-1.0"
11 changes: 11 additions & 0 deletions qml/AppItemMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Loader {

Menu {
id: contextMenu
Accessible.name: "ContextMenu"

topMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.UpArrow ? dockSpacing : 0
bottomMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.DownArrow ? dockSpacing : 0
Expand All @@ -41,6 +42,7 @@ Loader {

MenuItem {
text: qsTr("Open")
Accessible.name: "Open"
enabled: !root.desktopId.startsWith("internal/folders/")
onTriggered: {
launchApp(root.desktopId)
Expand All @@ -49,6 +51,7 @@ Loader {
MenuSeparator {}
MenuItem {
id: pinToTopMenu
Accessible.name: "PinToTopMenu"
enabled: false
visible: isFavoriteItem && !hideFavoriteMenu
height: visible ? implicitHeight : 0 // FIXME: seems this can cause some issue
Expand All @@ -59,6 +62,7 @@ Loader {
}
MenuItem {
id: moveToTopMenu
Accessible.name: "MoveToTopMenu"
visible: !hideMoveToTopMenu
enabled: visible
height: visible ? implicitHeight : 0
Expand All @@ -69,6 +73,7 @@ Loader {
}
MenuItem {
id: addOrRemoveFavMenu
Accessible.name: "AddOrRemoveFavMenu"
visible: !hideFavoriteMenu
enabled: false
height: visible ? implicitHeight : 0 // FIXME: same as above
Expand All @@ -86,6 +91,7 @@ Loader {
height: visible ? implicitHeight : 0 // FIXME: same as above
}
MenuItem {
Accessible.name: "RemoveFromDesktop"
enabled: !root.desktopId.startsWith("internal/folders/")
text: DesktopIntegration.isOnDesktop(root.desktopId) ? qsTr("Remove from desktop") : qsTr("Send to desktop")
onTriggered: {
Expand All @@ -97,6 +103,7 @@ Loader {
}
}
MenuItem {
Accessible.name: "RemoveFromDock"
enabled: !root.desktopId.startsWith("internal/")
text: DesktopIntegration.isDockedApp(root.desktopId) ? qsTr("Remove from dock") : qsTr("Send to dock")
onTriggered: {
Expand All @@ -109,19 +116,22 @@ Loader {
}
MenuSeparator {}
MenuItem {
Accessible.name: "RemoveFromStartup"
enabled: !root.desktopId.startsWith("internal/folders/")
text: DesktopIntegration.isAutoStart(root.desktopId) ? qsTr("Remove from startup") : qsTr("Add to startup")
onTriggered: {
DesktopIntegration.setAutoStart(root.desktopId, !DesktopIntegration.isAutoStart(root.desktopId))
}
}
MenuItem {
Accessible.name: "UseAProxy"
visible: false
enabled: false
text: qsTr("Use a proxy")
height: visible ? implicitHeight : 0 // FIXME: same as above
}
MenuItem {
Accessible.name: "DisableDisplayScaling"
visible: !hideDisplayScalingMenu
enabled: visible && !root.desktopId.startsWith("internal/folders/")
height: visible ? implicitHeight : 0 // FIXME: same as above
Expand All @@ -133,6 +143,7 @@ Loader {
}
}
MenuItem {
Accessible.name: "Uninstall"
enabled: !root.desktopId.startsWith("internal/folders/") && !DesktopIntegration.appIsCompulsoryForDesktop(root.desktopId)
text: qsTr("Uninstall")
onTriggered: {
Expand Down
7 changes: 6 additions & 1 deletion qml/DebugDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -18,6 +18,7 @@ Column {

Switch {
text: "Use regular window (need restart)"
Accessible.name: "UseRegularWindowNeedRestart"
checked: DebugHelper.useRegularWindow
onCheckedChanged: {
DebugHelper.useRegularWindow = checked
Expand All @@ -26,6 +27,7 @@ Column {

Switch {
text: "Avoid launch application"
Accessible.name: "AvoidLaunchApplication"
checked: DebugHelper.avoidLaunchApp
onCheckedChanged: {
DebugHelper.avoidLaunchApp = checked
Expand All @@ -34,6 +36,7 @@ Column {

Switch {
text: "Avoid hide launchpad window"
Accessible.name: "AvoidHideLaunchpadWindow"
checked: DebugHelper.avoidHideWindow
onCheckedChanged: {
DebugHelper.avoidHideWindow = checked
Expand All @@ -42,6 +45,7 @@ Column {

Switch {
text: "Display item's bounding rectangle"
Accessible.name: "DisplayItemSBoundingRectangle"
checked: DebugHelper.itemBoundingEnabled
onCheckedChanged: {
DebugHelper.itemBoundingEnabled = checked
Expand All @@ -50,6 +54,7 @@ Column {

ToolButton {
text: "Close launchpad application"
Accessible.name: "CloseLaunchpadApplication"
onClicked: {
Qt.quit()
}
Expand Down
5 changes: 4 additions & 1 deletion qml/DummyAppItemMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -23,6 +23,7 @@ Loader {

Menu {
id: contextMenu
Accessible.name: "ContextMenu_2"
topMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.UpArrow ? dockSpacing : 0
bottomMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.DownArrow ? dockSpacing : 0
leftMargin: isFullscreen && DesktopIntegration.dockPosition === Qt.LeftArrow ? dockSpacing : 0
Expand All @@ -31,13 +32,15 @@ Loader {

MenuItem {
text: qsTr("Install")
Accessible.name: "Install"
onTriggered: {
launchApp(root.desktopId)
}
}

MenuItem {
text: qsTr("Remove")
Accessible.name: "Remove"
onTriggered: {
DesktopIntegration.uninstallApp(root.desktopId)
}
Expand Down
6 changes: 6 additions & 0 deletions qml/FolderGridViewPopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ Popup {

TextInput {
id: folderNameEdit
Accessible.name: "FolderNameEdit"
Layout.fillWidth: true
Layout.leftMargin: contentRoot.titleMargin - root.padding
Layout.rightMargin: contentRoot.titleMargin - root.padding
Expand Down Expand Up @@ -397,6 +398,8 @@ Popup {
id: fullScreenGridViewContainer
GridViewContainer {
id: folderGridViewContainer
Accessible.name: "FolderGridViewContainer"
Accessible.role: Accessible.Pane
objectName: "folderGridViewContainer"
anchors.fill: parent
rows: 3
Expand Down Expand Up @@ -480,6 +483,8 @@ Popup {
id: listViewGridViewContainer
Windowed.GridViewContainer {
id: folderGridViewContainer
Accessible.name: "FolderGridViewContainer_2"
Accessible.role: Accessible.Pane
anchors.fill: parent
rows: 3
columns: 4
Expand Down Expand Up @@ -685,6 +690,7 @@ Popup {
Layout.alignment: Qt.AlignHCenter
visible: folderPagesView.count > 1 ? true : false
id: folderPageIndicator
Accessible.name: "FolderPageIndicator"
implicitHeight: isWindowedMode ? 13 : folderPageIndicator.implicitWidth
count: folderPagesView.count
currentIndex: folderPagesView.currentIndex
Expand Down
12 changes: 11 additions & 1 deletion qml/FullscreenFrame.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,15 @@ InputEventItem {

ToolButton {
id: exitFullscreenBtn
Accessible.name: "Exit fullscreen"
Accessible.name: "ExitFullscreen"
anchors.right: fullscreenHeader.right
ColorSelector.family: Palette.CrystalColor
icon.name: "launcher_exit_fullscreen"
ToolTip.visible: hovered
ToolTip.delay: 500
ToolTip.text: qsTr("Window Mode")
background: WindowedLaunchpad.ItemBackground {
Accessible.ignored: true
button: exitFullscreenBtn
}
onClicked: {
Expand All @@ -336,6 +337,7 @@ InputEventItem {

PageIndicator {
id: indicator
Accessible.name: "Indicator"

anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
Expand Down Expand Up @@ -378,6 +380,7 @@ InputEventItem {

ListView {
id: listviewPage
Accessible.name: "ListviewPage"

anchors.fill: parent
snapMode: ListView.SnapOneItem
Expand Down Expand Up @@ -454,6 +457,8 @@ InputEventItem {

GridViewContainer {
id: gridViewContainer
Accessible.name: "GridViewContainer"
Accessible.role: Accessible.Pane
objectName: "gridViewContainer"
anchors.fill: parent
rows: 4
Expand Down Expand Up @@ -734,6 +739,8 @@ InputEventItem {

GridViewContainer {
id: searchResultGridViewContainer
Accessible.name: "SearchResultGridViewContainer"
Accessible.role: Accessible.Pane

anchors.fill: parent
visible: searchEdit.text !== ""
Expand All @@ -751,6 +758,7 @@ InputEventItem {
padding: 10
interactive: true
vScrollBar: ScrollBar {
Accessible.name: "GridViewContainer_ScrollBar"
visible: parent.model.count > 4 * 8
active: parent.model.count > 4 * 8
}
Expand Down Expand Up @@ -800,6 +808,8 @@ InputEventItem {

FolderGridViewPopup {
id: folderGridViewPopup
Accessible.name: "FolderGridViewPopup"
Accessible.role: Accessible.Dialog
cs: searchResultGridViewContainer.cellHeight
centerPosition: Qt.point(curPointX, curPointY)

Expand Down
1 change: 1 addition & 0 deletions qml/GridViewContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ FocusScope {

GridView {
id: gridView
Accessible.name: "GridView"

ScrollBar.vertical: root.vScrollBar

Expand Down
5 changes: 4 additions & 1 deletion qml/IconItemDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,14 @@ Control {
ToolTip.delay: 500
ToolTip.visible: hovered && iconItemLabel.truncated
background: ItemBackground {
Accessible.ignored: true
radius: isWindowedMode ? 8 : 18
button: parent
}
}
background: DebugBounding { }
background: DebugBounding {
Accessible.ignored: true
}

Keys.onSpacePressed: {
if (model.itemType === ItemArrangementProxyModel.FolderItemType) {
Expand Down
8 changes: 6 additions & 2 deletions qml/Main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -269,7 +269,10 @@ QtObject {
id: windowedFrameImpl
anchors.fill: parent
focus: true
sourceComponent: WindowedFrame { }
sourceComponent: WindowedFrame {
Accessible.name: "Loader_WindowedFrame"
Accessible.role: Accessible.Pane
}

Label {
visible: DebugHelper.qtDebugEnabled
Expand Down Expand Up @@ -421,6 +424,7 @@ QtObject {
Item {
Button {
id: cancelButton
Accessible.name: "CancelButton"
text: qsTr("Cancel")
onClicked: {
confirmUninstallDlg.close()
Expand Down
4 changes: 3 additions & 1 deletion qml/windowed/AlphabetCategoryPopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -84,6 +84,8 @@ Popup {

Windowed.GridViewContainer {
id: alphabetCategoryContainer
Accessible.name: "AlphabetCategoryContainer"
Accessible.role: Accessible.Pane

anchors.centerIn: parent

Expand Down
8 changes: 7 additions & 1 deletion qml/windowed/AnalysisView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Control {

FrequentlyUsedView {
id: frequentlyUsedView
Accessible.name: "FrequentlyUsedView"
Accessible.role: Accessible.Pane
model: freqUsedModel
visible: count > 0
maxCount: recentlyInstalledView.visible ? 12 : 16
Expand All @@ -42,6 +44,8 @@ Control {

RecentlyInstalledView {
id: recentlyInstalledView
Accessible.name: "RecentlyInstalledView"
Accessible.role: Accessible.Pane
model: RecentlyInstalledProxyModel {
sourceModel: AppsModel
installedTimeRole: AppsModel.InstalledTimeRole
Expand All @@ -58,5 +62,7 @@ Control {
}
}

background: DebugBounding { }
background: DebugBounding {
Accessible.ignored: true
}
}
2 changes: 2 additions & 0 deletions qml/windowed/AppList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ ColumnLayout {

FreeSortListView {
id: freeSortView
Accessible.name: "FreeSortListView"
Accessible.role: Accessible.Pane
anchors.fill: viewContainer
visible: isFreeSort

Expand Down
Loading
Loading