LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed roles for menu

Browse source
This commit is contained in:
Eism 2021-08-31 15:00:13 +02:00
parent e6128a8b4e
commit 9e9da416c7
6 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/appshell/qml/AppMenuBar.qml
View file

@ -54,7 +54,7 @@ ListView {
id: navPanel
name: "AppMenuBar"
enabled: root.enabled && root.visible
accessible.name: qsTrc("appshell", "App menu bar") + " " + navPanel.directionInfo
accessible.name: qsTrc("appshell", "App menu bar")
}
delegate: FlatButton {
@ -71,7 +71,7 @@ ListView {
navigation.name: text
navigation.panel: navPanel
navigation.order: index
navigation.accessible.name: {
accessible.name: {
return text.replace('&', '')
}

2
src/appshell/qml/AppTitleBar.qml
View file

@ -93,7 +93,7 @@ Rectangle {
name: "AppControl"
section: navSec
order: 1
accessible.name: qsTrc("appshell", "App control") + " " + navAppControlPanel.directionInfo
accessible.name: qsTrc("appshell", "App control")
}
FlatButton {

1
src/framework/accessibility/iaccessible.h
View file

@ -49,6 +49,7 @@ public:
RadioButton,
ComboBox,
ListItem,
MenuItem,
// Custom roles
Information, // just text

1
src/framework/accessibility/internal/accessibleiteminterface.cpp
View file

@ -189,6 +189,7 @@ QAccessible::Role AccessibleItemInterface::role() const
case IAccessible::Role::RadioButton: return QAccessible::RadioButton;
case IAccessible::Role::ComboBox: return QAccessible::ComboBox;
case IAccessible::Role::ListItem: return QAccessible::ListItem;
case IAccessible::Role::MenuItem: return QAccessible::MenuItem;
case IAccessible::Role::Information: {
#ifdef Q_OS_WIN
return QAccessible::StaticText;

1
src/framework/ui/view/qmlaccessible.h
View file

@ -57,6 +57,7 @@ public:
RadioButton,
ComboBox,
ListItem,
MenuItem,
Information
};
Q_ENUM(Role)

3
src/framework/uicomponents/qml/MuseScore/UiComponents/StyledMenuItem.qml
View file

@ -59,10 +59,11 @@ ListItemBlank {
isSelected: Boolean(itemPrv.showedSubMenu) || (itemPrv.isSelectable && itemPrv.isSelected) || navigation.active
navigation.name: titleLabel.text
navigation.accessible.role: MUAccessible.MenuItem
navigation.accessible.name: {
var text = titleLabel.text
if (itemPrv.isCheckable) {
text += " " + (itemPrv.isChecked ? qsTrc("appshell", "checked") : qsTrc("appshell", "not checked"))
text += " " + (itemPrv.isChecked ? qsTrc("appshell", "checked") : qsTrc("appshell", "unchecked"))
} else if (itemPrv.isSelectable) {
text += " " + (itemPrv.isSelected ? qsTrc("appshell", "selected") : qsTrc("appshell", "not selected"))
}