Skip to content

fix(a11y): add AT-SPI accessible names/roles for dde-shell panels #1712

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

fix(a11y): add AT-SPI accessible names/roles for dde-shell panels #1712

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
13 changes: 12 additions & 1 deletion example/applet-example-data/package/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: LGPL-3.0-or-later

Expand Down Expand Up @@ -43,19 +43,24 @@ AppletItem {
}

PanelPopup {
Accessible.role: Accessible.Dialog
Accessible.name: qsTr("Popup")
id: popup
x: 100
y: -200
width: 200
height: 200

Button {
Accessible.name: qsTr("popup content")
text: "popup content"
anchors.centerIn: parent
}
}

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.name: qsTr("toolTip content")
id: toolTip
x: 100
y: -100
Expand All @@ -66,20 +71,26 @@ AppletItem {
}

LP.Menu {
Accessible.name: qsTr("Platform Menu")
id: platformMenu
LP.MenuItem {
Accessible.name: qsTr("item 1")
text: "item 1"
}
LP.MenuItem {
Accessible.name: qsTr("non Item ")
text: "non Item " + String(Applet.id).slice(0, 5)
}
LP.MenuItem {
Accessible.name: qsTr("Panel ")
text: "Panel " + String(Panel.id).slice(0, 5)
}
LP.MenuItem {
Accessible.name: DS.applet
text: "DS.applet " + String(DS.applet("org.deepin.ds.example").id).slice(0, 5)
}
LP.MenuItem {
Accessible.name: qsTr("Popup")
text: "Popup"
onTriggered: {
popup.open()
Expand Down
4 changes: 3 additions & 1 deletion example/applet-example/package/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: LGPL-3.0-or-later

Expand All @@ -16,6 +16,8 @@ AppletItem {
anchors.fill: parent
color: "green"
TextEx {
Accessible.role: Accessible.StaticText
Accessible.name: qsTr("Hello world \n")
anchors.centerIn: parent
text: "Hello world \n" + String(Applet.id).slice(1, 16)
}
Expand Down
5 changes: 4 additions & 1 deletion example/bridge-example/package/appletitem.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 @@ -32,6 +32,8 @@ AppletItem {
}

PanelPopup {
Accessible.role: Accessible.Dialog
Accessible.name: qsTr("Launcher Debugger Panel")
id: launcherDebuggerPanel

width: 1000
Expand All @@ -58,6 +60,7 @@ AppletItem {
anchors.bottom: parent.bottom

TreeView {
Accessible.name: qsTr("Tree View")
id: treeView
model: DListToTableProxyModel {
sourceModel: testmodel // Applet.applicationsModel
Expand Down
3 changes: 2 additions & 1 deletion example/drag-example/package/main.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: LGPL-3.0-or-later

Expand All @@ -14,6 +14,7 @@ AppletItem {
implicitWidth: gridview.width
implicitHeight: gridview.height
GridView {
Accessible.name: qsTr("Gridview")
id: gridview
width: 320
height: 100
Expand Down
14 changes: 13 additions & 1 deletion example/layershell-example/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 @@ -28,6 +28,7 @@ Window {
Column {
id: comboBox
ComboBox {
Accessible.name: qsTr("Layer Combox")
id: layerCombox
width: 100
textRole: "text"
Expand All @@ -45,6 +46,7 @@ Window {
}

ComboBox {
Accessible.name: qsTr("Keyboard Interactivity Combox")
id: keyboardInteractivityCombox
width: 200
textRole: "text"
Expand All @@ -61,6 +63,7 @@ Window {
}

ComboBox {
Accessible.name: qsTr("Screen Combo Box")
id: screenComboBox
width: 200
textRole: "name"
Expand All @@ -80,6 +83,7 @@ Window {
Column {
spacing: 20
Button {
Accessible.name: qsTr("Top")
id: buttonTop
text: "Top"
width: 40
Expand All @@ -97,6 +101,7 @@ Window {
Row {
spacing: 20
Button {
Accessible.name: qsTr("Left")
id: buttonLeft
text: "Left"
width: 40
Expand All @@ -110,6 +115,7 @@ Window {
}
}
Button {
Accessible.name: qsTr("Right")
id: buttonRight
text: "Right"
width: 40
Expand All @@ -124,6 +130,7 @@ Window {
}
}
Button {
Accessible.name: qsTr("Buttom")
id: buttonBottom
text: "Buttom"
width: 40
Expand All @@ -150,6 +157,7 @@ Window {
text: "LeftMargin: "
}
SpinBox {
Accessible.name: qsTr("Left")
id: left
stepSize: 10
editable: true
Expand All @@ -159,6 +167,7 @@ Window {
text: "TopMargin: "
}
SpinBox {
Accessible.name: qsTr("Top")
id: top
stepSize: 10
editable: true
Expand All @@ -168,6 +177,7 @@ Window {
text: "RightMargin: "
}
SpinBox {
Accessible.name: qsTr("Right")
id: right
stepSize: 10
editable: true
Expand All @@ -177,6 +187,7 @@ Window {
text: "BottomMargin: "
}
SpinBox {
Accessible.name: qsTr("Bottom")
id: bottom
stepSize: 10
editable: true
Expand All @@ -187,6 +198,7 @@ Window {
}

SpinBox {
Accessible.name: qsTr("Excludezone")
id: excludezone
editable: true
from: -1
Expand Down
5 changes: 4 additions & 1 deletion example/lockscreen-example/package/main.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: LGPL-3.0-or-later

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

Column {
Button {
Accessible.name: qsTr("Lock")
text: "Lock"
onClicked: {
let lockscreen = lockscreenApplet()
Expand All @@ -32,6 +33,7 @@ AppletItem {
}
}
Button {
Accessible.name: qsTr("Shutdown")
text: "Shutdown"
onClicked: {
let lockscreen = lockscreenApplet()
Expand All @@ -41,6 +43,7 @@ AppletItem {
}
}
Button {
Accessible.name: qsTr("SwitchUser")
text: "SwitchUser"
onClicked: {
let lockscreen = lockscreenApplet()
Expand Down
4 changes: 3 additions & 1 deletion example/osd-example/package/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: LGPL-3.0-or-later

Expand All @@ -13,6 +13,7 @@ AppletItem {
implicitHeight: 200

GridView {
Accessible.name: qsTr("GridView")
anchors.fill: parent
cellHeight: 40
property var audioTypes: ["AudioUp", "AudioDown", "AudioMute", "AudioUpAsh", "AudioDownAsh", "AudioMuteAsh"]
Expand All @@ -25,6 +26,7 @@ AppletItem {

model: types
delegate: Button {
Accessible.name: model.modelData
text: model.modelData
onClicked: Applet.sendOsd(modelData)
}
Expand Down
4 changes: 3 additions & 1 deletion frame/qml/PanelMenuWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

import QtQuick 2.15
import QtQuick.Window 2.15

PanelPopupWindow {
Accessible.role: Accessible.Window
Accessible.name: qsTr("Panel Popup Window")
id: root

flags: Qt.Popup | Qt.WindowStaysOnTopHint
Expand Down
4 changes: 3 additions & 1 deletion frame/qml/PanelToolTipWindow.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: LGPL-3.0-or-later

Expand All @@ -8,6 +8,8 @@ import org.deepin.ds 1.0
import org.deepin.dtk 1.0 as D

PanelPopupWindow {
Accessible.role: Accessible.Window
Accessible.name: qsTr("Panel Popup Window")
id: root

flags: Qt.ToolTip | Qt.WindowStaysOnTopHint
Expand Down
2 changes: 2 additions & 0 deletions panels/dock/AppletItemButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ IconButton {
}

background: AppletItemBackground {
Accessible.role: Accessible.DrawingArea
Accessible.name: qsTr("Applet Item Background")
radius: control.radius
isActive: control.isActive
}
Expand Down
1 change: 1 addition & 0 deletions panels/dock/OverflowContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Item {
property alias removeDisplaced: listView.removeDisplaced
property alias moveDisplaced: listView.moveDisplaced
ListView {
Accessible.name: qsTr("List View")
id: listView
anchors.fill: parent
orientation: useColumnLayout ? ListView.Vertical : ListView.Horizontal
Expand Down
6 changes: 5 additions & 1 deletion panels/dock/appruntimeitem/package/appruntimeitem.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
import QtQuick 2.15
Expand All @@ -20,12 +20,16 @@ AppletItem {
property bool isMenuVisible: false

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.name: qsTr("appruntime")
id: toolTip
text: qsTr("appruntime")
toolTipX: DockPanelPositioner.x
toolTipY: DockPanelPositioner.y
}
AppletItemButton {
Accessible.role: Accessible.Button
Accessible.name: qsTr("Button")
id: button
anchors.centerIn: parent
icon.name: "qrc:/ddeshell/package/icons/appruntime.svg"
Expand Down
2 changes: 2 additions & 0 deletions panels/dock/multitaskview/package/multitaskview.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ AppletDockItem {
Accessible.name: toolTip.text

PanelToolTip {
Accessible.role: Accessible.ToolTip
Accessible.name: qsTr("Multitasking View")
id: toolTip
text: qsTr("Multitasking View")
toolTipX: DockPanelPositioner.x
Expand Down
Loading
Loading