Merge pull request #30155 from cbjeukendrup/fdl_keynav

Fix keyboard navigation in Fretboard Diagram Legend properties

Author: DmitryArefiev

src/inspector/view/qml/MuseScore/Inspector/common/ColorSection.qml

@@ -42,7 +42,7 @@ InspectorPropertyView {
         navigation.name: root.navigationName + " ColorPicker"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart + 1
-        navigation.accessible.name: root.titleText + " " + Utils.accessibleColorDescription(colorPicker.color)
+        navigation.accessible.name: root.accessibleName + " " + Utils.accessibleColorDescription(colorPicker.color)
 
         enabled: root.propertyItem ? root.propertyItem.isEnabled : false
         isIndeterminate: root.propertyItem && enabled ? root.propertyItem.isUndefined : false

src/inspector/view/qml/MuseScore/Inspector/common/DropdownPropertyView.qml

@@ -47,7 +47,7 @@ InspectorPropertyView {
         navigation.name: root.navigationName + " Dropdown"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart + 1
-        navigation.accessible.name: root.titleText + " " + currentText
+        navigation.accessible.name: root.accessibleName + " " + currentText
 
         currentIndex: root.propertyItem && !root.propertyItem.isUndefined
                       ? dropdownItem.indexOfValue(root.propertyItem.value)

src/inspector/view/qml/MuseScore/Inspector/common/FlatRadioButtonGroupPropertyView.qml

@@ -54,7 +54,7 @@ InspectorPropertyView {
 
         navigationPanel: root.navigationPanel
         navigationRowStart: root.navigationRowStart
-        accessibleName: root.titleText
+        accessibleName: root.accessibleName
 
         iconFontSize: root.requestIconFontSize
 

src/inspector/view/qml/MuseScore/Inspector/common/InspectorPropertyView.qml

@@ -45,6 +45,8 @@ Column {
     property alias showTitle: titleLabelLoader.visible
     property alias showButton: buttonLoader.visible
 
+    property string accessibleName: titleText
+
     readonly property bool isStyled: propertyItem ? propertyItem.isStyled : false
     property bool isModified: propertyItem ? propertyItem.isModified : false
 
@@ -124,8 +126,8 @@ Column {
                     navigation.name: root.navigationName + "Reset"
                     navigation.panel: root.navigationPanel
                     navigation.row: root.buttonNavigationRow
-                    navigation.accessible.name: root.titleText ? qsTrc("inspector", "Reset “%1” to default value").arg(root.titleText)
-                                                               : qsTrc("inspector", "Reset property to default value")
+                    navigation.accessible.name: root.accessibleName ? qsTrc("inspector", "Reset “%1” to default value").arg(root.accessibleName)
+                                                                    : qsTrc("inspector", "Reset property to default value")
 
                     enabled: root.isModified
 
@@ -145,7 +147,9 @@ Column {
                     navigation.name: root.navigationName + " Menu Button"
                     navigation.panel: root.navigationPanel
                     navigation.row: root.buttonNavigationRow
-                    navigation.accessible.name: root.titleText + " " + qsTrc("inspector", "Menu")
+
+                    //: %1 is replaced with the name of the property
+                    navigation.accessible.name: qsTrc("inspector", "Menu for “%1”").arg(root.accessibleName)
 
                     menuModel: {
                         var result = []

src/inspector/view/qml/MuseScore/Inspector/common/OffsetSection.qml

@@ -53,7 +53,7 @@ InspectorPropertyView {
             navigation.name: "HorizontalOffsetControl"
             navigation.panel: root.navigationPanel
             navigation.row: root.navigationRowStart + 1
-            navigation.accessible.name: root.titleText + " " + qsTrc("inspector", "Horizontal") + " " + currentValue
+            navigation.accessible.name: root.accessibleName + " " + qsTrc("inspector", "Horizontal") + " " + currentValue
 
             icon: IconCode.HORIZONTAL
 
@@ -75,7 +75,7 @@ InspectorPropertyView {
             navigation.name: "VerticalOffsetControl"
             navigation.panel: root.navigationPanel
             navigation.row: root.navigationRowStart + 2
-            navigation.accessible.name: root.titleText + " " + qsTrc("inspector", "Vertical") + " " + currentValue
+            navigation.accessible.name: root.accessibleName + " " + qsTrc("inspector", "Vertical") + " " + currentValue
 
             icon: IconCode.VERTICAL
 

src/inspector/view/qml/MuseScore/Inspector/common/SpinBoxPropertyView.qml

@@ -52,7 +52,7 @@ InspectorPropertyView {
         navigation.name: root.navigationName + " Spinbox"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart + 1
-        navigation.accessible.name: root.titleText
+        navigation.accessible.name: root.accessibleName
 
         isIndeterminate: root.propertyItem ? root.propertyItem.isUndefined : true
         currentValue: Boolean(root.propertyItem) && !Boolean(root.propertyItem.isUndefined) ? root.propertyItem.value : 0.0

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameChordsControlPanel.qml

@@ -51,17 +51,17 @@ RowLayout {
     signal resetListRequested();
 
     FlatButton {
-        id: upBotton
+        id: upButton
 
         Layout.fillWidth: true
 
         icon: IconCode.ARROW_UP
         enabled: root.isMovingUpAvailable
+        toolTipTitle: qsTrc("inspector", "Move up")
 
         navigation.name: "MoveUpButton"
         navigation.panel: root.navigationPanel
         navigation.row: root.navigationRowStart
-        navigation.accessible.name: qsTrc("inspector", "Move up")
 
         onClicked: {
             root.moveSelectionUpRequested()
@@ -75,11 +75,11 @@ RowLayout {
 
         icon: IconCode.ARROW_DOWN
         enabled: root.isMovingDownAvailable
+        toolTipTitle: qsTrc("inspector", "Move down")
 
         navigation.name: "MoveDownButton"
         navigation.panel: root.navigationPanel
-        navigation.row: upBotton.navigation.row + 1
-        navigation.accessible.name: qsTrc("inspector", "Move down")
+        navigation.row: upButton.navigation.row + 1
 
         onClicked: {
             root.moveSelectionDownRequested()
@@ -89,12 +89,12 @@ RowLayout {
     PropertyResetButton {
         id: resetButton
 
+        enabled: root.listOrderItem.isModified || root.hasInvisibleChords
+        toolTipTitle: qsTrc("inspector", "Reset chord list")
+
         navigation.name: "ResetButton"
         navigation.panel: root.navigationPanel
         navigation.row: downButton.navigation.row + 1
-        navigation.accessible.name: qsTrc("inspector", "Reset chord list")
-
-        enabled: root.listOrderItem.isModified || root.hasInvisibleChords
 
         onClicked: {
             root.resetListRequested()

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameChordsView.qml

@@ -31,6 +31,7 @@ StyledListView {
 
     property NavigationPanel navigationPanel: null
     property int navigationRowStart: 1
+    property int navigationRowEnd: navigationRowStart + (count * 2) - 1
 
     spacing: 0
 
@@ -72,8 +73,7 @@ StyledListView {
 
         navigation.name: item.title
         navigation.panel: root.navigationPanel
-        navigation.row: root.navigationRowStart + model.index
-        navigation.column: 0
+        navigation.row: root.navigationRowStart + (model.index * 2)
         navigation.accessible.name: item.title
         navigation.onActiveChanged: {
             if (navigation.active) {
@@ -94,8 +94,7 @@ StyledListView {
                 Layout.alignment: Qt.AlignLeft
 
                 navigation.panel: root.navigationPanel
-                navigation.row: itemDelegate.navigation.row
-                navigation.column: 1
+                navigation.row: root.navigationRowStart + (model.index * 2) + 1
                 accessibleText: titleLabel.text
 
                 isVisible: itemDelegate.item.isVisible

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/FretFrameSettingsTab.qml

@@ -51,7 +51,7 @@ FocusableItem {
 
             navigation.name: "Scale with staff size"
             navigation.panel: root.navigationPanel
-            navigation.row: alignmentSection.navigationRowEnd + 1
+            navigation.row: root.navigationRowStart
         }
 
         FretFrameScalesSection {
@@ -60,7 +60,7 @@ FocusableItem {
             diagramScale: root.model ? root.model.diagramScale : null
 
             navigationPanel: root.navigationPanel
-            navigationRowStart: root.navigationRowStart + 1
+            navigationRowStart: matchStaffSize.navigation.row + 1
         }
 
         FretFrameGapsSection {
@@ -116,7 +116,7 @@ FocusableItem {
             notationGapBelow: root.model ? root.model.paddingToNotationBelow : null
 
             navigationPanel: root.navigationPanel
-            navigationRowStart: matchStaffSize.navigationRowEnd + 1
+            navigationRowStart: alignmentSection.navigationRowEnd + 1
         }
 
         SeparatorLine { anchors.margins: -12 }

src/inspector/view/qml/MuseScore/Inspector/notation/frames/internal/VerticalGapsSection.qml

@@ -37,7 +37,7 @@ Item {
 
     property NavigationPanel navigationPanel: null
     property int navigationRowStart: 1
-    property int navigationRowEnd: gapBelow.navigationRowEnd
+    property int navigationRowEnd: gapNotationBelow.navigationRowEnd
 
     height: childrenRect.height
     width: parent.width
@@ -48,7 +48,7 @@ Item {
 
     StyledTextLabel {
         id: gapToStaff
-        horizontalAlignment: Qt.AlignLeft
+        horizontalAlignment: Text.AlignLeft
         text: qsTrc("inspector", "Gap to staff/frames")
         font: ui.theme.bodyBoldFont
     }
@@ -69,6 +69,7 @@ Item {
 
         navigationPanel: root.navigationPanel
         navigationRowStart: root.navigationRowStart + 1
+        accessibleName: qsTrc("inspector", "Gap to staff/frames above")
     }
 
     SpinBoxPropertyView {
@@ -86,13 +87,14 @@ Item {
 
         navigationPanel: root.navigationPanel
         navigationRowStart: gapAbove.navigationRowEnd + 1
+        accessibleName: qsTrc("inspector", "Gap to staff/frames below")
     }
 
     StyledTextLabel {
         id: notationPadding
         anchors.top: gapAbove.bottom
         anchors.topMargin: 12
-        horizontalAlignment: Qt.AlignLeft
+        horizontalAlignment: Text.AlignLeft
         text: qsTrc("inspector", "Clearance for notation")
         font: ui.theme.bodyBoldFont
     }
@@ -112,7 +114,8 @@ Item {
         measureUnitsSymbol: qsTrc("global", "sp")
 
         navigationPanel: root.navigationPanel
-        navigationRowStart: root.navigationRowStart + 1
+        navigationRowStart: gapBelow.navigationRowEnd + 1
+        accessibleName: qsTrc("inspector", "Clearance for notation above")
     }
 
     SpinBoxPropertyView {
@@ -129,6 +132,7 @@ Item {
         measureUnitsSymbol: qsTrc("global", "sp")
 
         navigationPanel: root.navigationPanel
-        navigationRowStart: gapAbove.navigationRowEnd + 1
+        navigationRowStart: gapNotationAbove.navigationRowEnd + 1
+        accessibleName: qsTrc("inspector", "Clearance for notation below")
     }
 }