Fix qmllint warnings

cbjeukendrup · cbjeukendrup · commit 32ed1c567705 · 2025-11-23T19:38:41.000+01:00
diff --git a/src/framework/learn/qml/Muse/Learn/internal/ClassesPage.qml b/src/framework/learn/qml/Muse/Learn/internal/ClassesPage.qml
@@ -79,7 +79,7 @@ Item {
         anchors.fill: parent
 
         contentWidth: parent.width
-        contentHeight: authorInfo.height + sideMargin
+        contentHeight: authorInfo.height + root.sideMargin
 
         topMargin: topGradient.height
 
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ButtonBox.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ButtonBox.qml
@@ -19,12 +19,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
-import QtQml 2.14
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQml
+import QtQuick.Controls
+import QtQuick.Layouts
 
-import Muse.Ui 1.0
+import Muse.Ui
 import Muse.UiComponents
 
 Container {
@@ -71,7 +71,7 @@ Container {
 
     function accentButton() {
         for (var i = 0; i < root.count; i++) {
-            var btn = root.itemAt(i)
+            var btn = root.itemAt(i) as FlatButton
             if (btn.accentButton) {
                 return btn
             }
@@ -81,10 +81,7 @@ Container {
     }
 
     function addButton(text, buttonId, buttonRole, isAccent, isLeftSide) {
-        const button = Qt.createQmlObject('
-                                    import Muse.UiComponents
-                                    FlatButton {
-                                    }', root)
+        const button = Qt.createQmlObject("import Muse.UiComponents; FlatButton {}", root) as FlatButton
         button.text = text
         button.accentButton = isAccent
 
@@ -103,7 +100,7 @@ Container {
 
     function restoreAccessibility() {
         for (var i = 0; i < root.count; i++) {
-            var btn = root.itemAt(i)
+            var btn = root.itemAt(i) as FlatButton
             if (!Boolean(btn.navigation)) {
                 continue
             }
@@ -163,7 +160,7 @@ Container {
                     continue
                 }
 
-                var btn = root.itemAt(i)
+                var btn = root.itemAt(i) as FlatButton
                 if (buttonInfo.button !== btn) {
                     root.moveItem(buttonInfo.index, i)
                 }
@@ -193,7 +190,7 @@ Container {
 
         function buttonInfo(buttonType) {
             for (var i = 0; i < root.count; i++) {
-                var btn = root.itemAt(i)
+                var btn = root.itemAt(i) as FlatButton
                 if (!Boolean(btn)) {
                     continue
                 }
@@ -237,7 +234,7 @@ Container {
             root.addItem(separator)
 
             for (var i = root.count - 2; i >= 0; i--) {
-                var button = root.itemAt(i)
+                var button = root.itemAt(i) as FlatButton
                 if (button.buttonId === lastLeftSideButtonType) {
                     break;
                 }
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/CheckBox.qml b/src/framework/uicomponents/qml/Muse/UiComponents/CheckBox.qml
@@ -122,7 +122,7 @@ FocusScope {
         z: label.z - 1 // enable clicking on links in label text
 
         onClicked: {
-            navigation.requestActiveByInteraction()
+            navCtrl.requestActiveByInteraction()
 
             root.clicked()
         }
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ColorPicker.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ColorPicker.qml
@@ -78,7 +78,7 @@ Rectangle {
     StyledIconLabel {
         anchors.fill: parent
         iconCode: IconCode.QUESTION_MARK
-        visible: isIndeterminate
+        visible: root.isIndeterminate
     }
 
     MouseArea {
@@ -89,7 +89,7 @@ Rectangle {
         hoverEnabled: true
 
         onClicked: {
-            navigation.requestActiveByInteraction()
+            navCtrl.requestActiveByInteraction()
 
             prv.selectColor()
         }
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/ExpandableBlank.qml b/src/framework/uicomponents/qml/Muse/UiComponents/ExpandableBlank.qml
@@ -19,9 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
+import QtQuick
 
-import Muse.Ui 1.0
 import Muse.UiComponents
 
 FocusScope {
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FlatButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FlatButton.qml
@@ -19,10 +19,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
+pragma ComponentBehavior: Bound
 
-import Muse.Ui 1.0
+import QtQuick
+import QtQuick.Layouts
+
+import Muse.Ui 
 import Muse.UiComponents
 
 FocusScope {
@@ -194,8 +196,8 @@ FocusScope {
         anchors.verticalCenter: parent ? parent.verticalCenter : undefined
         anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
 
-        readonly property real itemImplicitWidth: item ? item.implicitWidth : 0
-        readonly property real itemImplicitHeight: item ? item.implicitHeight : 0
+        readonly property real itemImplicitWidth: (item as Item)?.implicitWidth ?? 0
+        readonly property real itemImplicitHeight: (item as Item)?.implicitHeight ?? 0
 
         sourceComponent: root.contentItem ? root.contentItem : defaultContentComponent
         readonly property Component defaultContentComponent: root.isVertical ? verticalContentComponent : horizontalContentComponent
@@ -213,7 +215,7 @@ FocusScope {
                 iconCode: root.icon
                 font: root.iconFont
                 color: root.iconColor
-                visible: !isEmpty && buttonType != FlatButton.TextOnly
+                visible: !isEmpty && root.buttonType != FlatButton.TextOnly
             }
 
             StyledTextLabel {
@@ -224,7 +226,7 @@ FocusScope {
                 textFormat: root.textFormat
                 wrapMode: Text.Wrap
                 maximumLineCount: root.maximumLineCount
-                visible: !isEmpty && buttonType != FlatButton.IconOnly
+                visible: !isEmpty && root.buttonType != FlatButton.IconOnly
             }
         }
     }
@@ -311,8 +313,8 @@ FocusScope {
         hoverEnabled: true
 
         onClicked: function(mouse) {
-            navigation.requestActiveByInteraction()
-            navigation.notifyAboutControlWasTriggered()
+            root.navigation.requestActiveByInteraction()
+            root.navigation.notifyAboutControlWasTriggered()
 
             root.doClicked(mouse)
         }
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FlatRadioButton.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FlatRadioButton.qml
@@ -19,10 +19,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
-import QtQuick.Controls 2.15
+pragma ComponentBehavior: Bound
 
-import Muse.Ui 1.0
+import QtQuick
+import QtQuick.Controls
+
+import Muse.Ui
 
 RadioDelegate {
     id: root
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/FlatRadioButtonList.qml b/src/framework/uicomponents/qml/Muse/UiComponents/FlatRadioButtonList.qml
@@ -19,10 +19,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
+pragma ComponentBehavior: Bound
+
+import QtQuick
 
 import Muse.UiComponents
-import Muse.Ui 1.0
+import Muse.Ui
 
 RadioButtonGroup {
     id: root
@@ -44,12 +46,15 @@ RadioButtonGroup {
             return
         }
 
-        root.itemAtIndex(0).navigation.requestActive()
+        (root.itemAtIndex(0) as FlatRadioButton).navigation.requestActive()
     }
 
     implicitHeight: ui.theme.defaultButtonSize
 
     delegate: FlatRadioButton {
+        required property var modelData
+        required property int index
+
         checked: root.currentValue  === modelData.value
 
         text: modelData.text ?? ""
@@ -63,7 +68,7 @@ RadioButtonGroup {
 
         navigation.name: "FlatRadioButtonList_" + (Boolean(text) ? text : modelData.title)
         navigation.panel: root.navigationPanel
-        navigation.row: root.navigationRowStart + 1 + model.index
+        navigation.row: root.navigationRowStart + 1 + index
         navigation.accessible.name: root.accessibleName + " " + (Boolean(text) ? text : modelData.title)
         navigation.accessible.description:  modelData.description ?? ""
 
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/StyledMenuLoader.qml b/src/framework/uicomponents/qml/Muse/UiComponents/StyledMenuLoader.qml
@@ -19,7 +19,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
+pragma ComponentBehavior: Bound
+
+import QtQuick
 
 import Muse.UiComponents
 
@@ -65,7 +67,7 @@ Loader {
         focusPolicies: PopupView.NoFocus
 
         accessibleName: loader.accessibleName
-
+        hasSiblingMenus: loader.hasSiblingMenus
         parentWindow: loader.parentWindow
 
         onHandleMenuItem: function(itemId) {
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledDropdownView.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledDropdownView.qml
@@ -20,9 +20,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.15
+pragma ComponentBehavior: Bound
 
-import Muse.Ui 1.0
+import QtQuick
+
+import Muse.Ui
 import Muse.UiComponents
 
 DropdownView {
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledMenu.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledMenu.qml
@@ -19,12 +19,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
+pragma ComponentBehavior: Bound
 
-import Muse.Ui 1.0
+import QtQuick
+import QtQuick.Window
+
+import Muse.Ui
 import Muse.UiComponents
 
 MenuView {
@@ -33,7 +33,7 @@ MenuView {
     property alias model: view.model
 
     property int preferredAlign: Qt.AlignRight // Left, HCenter, Right
-    property bool hasSiblingMenus: loader.hasSiblingMenus
+    required property bool hasSiblingMenus
 
     signal handleMenuItem(string itemId)
     signal openPrevMenu()
@@ -336,34 +336,30 @@ MenuView {
             delegate: Loader {
                 id: loader
 
-                property var itemData: Boolean(root.model.get) ? model.itemRole : modelData
-                property bool isSeparator: !Boolean(itemData) || !Boolean(itemData.title) || itemData.title === ""
+                required property var model
+                required property int index
 
-                sourceComponent: isSeparator ? separatorComp : menuItemComp
+                readonly property var modelData: Boolean(root.model.get) ? model.itemRole : model.modelData
+                readonly property bool isSeparator: !(modelData?.title)
 
-                onLoaded: {
-                    loader.item.modelData = Qt.binding(() => (itemData))
-                    loader.item.width = Qt.binding(() => ( Boolean(root.menuMetrics) ? root.menuMetrics.itemWidth : 0 ))
-                    if (Boolean(loader.item.navigation)) {
-                        loader.item.navigation.panel = content.navigationPanel
-                    }
-                }
+                sourceComponent: isSeparator ? separatorComp : menuItemComp
 
                 Component {
                     id: menuItemComp
 
                     StyledMenuItem {
                         id: item
+                        width: root.menuMetrics?.itemWidth ?? 0
 
-                        property string title: Boolean (loader.itemData) ? loader.itemData.title : ""
+                        modelData: loader.modelData
 
                         menuAnchorItem: root.anchorItem
                         parentWindow: root.window
 
                         navigation.panel: content.navigationPanel
-                        navigation.row: model.index
+                        navigation.row: loader.index
 
-                        iconAndCheckMarkMode: Boolean(root.menuMetrics) ? root.menuMetrics.iconAndCheckMarkMode : StyledMenuItem.None
+                        iconAndCheckMarkMode: root.menuMetrics?.iconAndCheckMarkMode || StyledMenuItem.None
 
                         reserveSpaceForShortcutsOrSubmenuIndicator: Boolean(root.menuMetrics) ?
                                                                         (root.menuMetrics.hasItemsWithShortcut || root.menuMetrics.hasItemsWithSubmenu) : false
@@ -409,10 +405,9 @@ MenuView {
                     id: separatorComp
 
                     Rectangle {
+                        width: root.menuMetrics?.itemWidth ?? 0
                         height: prv.separatorHeight
                         color: ui.theme.strokeColor
-
-                        property var modelData
                     }
                 }
             }
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledMenuItem.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/StyledMenuItem.qml
@@ -117,18 +117,17 @@ ListItemBlank {
         property string id: root.modelData?.id ?? ""
 
         property string title: root.modelData?.title ?? ""
-        property string titleWithMnemonicUnderline: modelData?.titleWithMnemonicUnderline ?? title
+        property string titleWithMnemonicUnderline: root.modelData?.titleWithMnemonicUnderline ?? title
 
-        property bool hasShortcuts: Boolean(modelData) && Boolean(modelData.shortcuts)
-        property string shortcuts: hasShortcuts ? modelData.shortcuts : ""
-
-        property bool isCheckable: Boolean(modelData) && Boolean(modelData.checkable)
-        property bool isChecked: isCheckable && Boolean(modelData.checked)
+        property bool hasShortcuts: Boolean(root.modelData?.shortcuts)
+        property string shortcuts: hasShortcuts ? root.modelData.shortcuts : ""
 
+        property bool isCheckable: Boolean(root.modelData?.checkable)
+        property bool isChecked: isCheckable && Boolean(root.modelData.checked)
         property bool isSelectable: Boolean(root.modelData?.selectable)
-        property bool isSelected: isSelectable && Boolean(root.modelData?.selected)
+        property bool isSelected: isSelectable && Boolean(root.modelData.selected)
 
-        property bool hasIcon: Boolean(modelData) && Boolean(modelData.icon) && modelData.icon !== IconCode.NONE
+        property bool hasIcon: Boolean(root.modelData?.icon) && root.modelData.icon !== IconCode.NONE
     }
 
     function calculatedLeftPartWidth() {
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/internal/ViewScrollBar.qml b/src/framework/uicomponents/qml/Muse/UiComponents/internal/ViewScrollBar.qml
diff --git a/src/framework/uicomponents/qml/Muse/UiComponents/popupview.h b/src/framework/uicomponents/qml/Muse/UiComponents/popupview.h
diff --git a/src/preferences/qml/MuseScore/Preferences/internal/ScrollPagesSection.qml b/src/preferences/qml/MuseScore/Preferences/internal/ScrollPagesSection.qml

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ FocusScope {`
`122`	`122`	`z: label.z - 1 // enable clicking on links in label text`
`123`	`123`
`124`	`124`	`onClicked: {`
`125`		`- navigation.requestActiveByInteraction()`
	`125`	`+ navCtrl.requestActiveByInteraction()`
`126`	`126`
`127`	`127`	`root.clicked()`
`128`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ Rectangle {`
`78`	`78`	`StyledIconLabel {`
`79`	`79`	`anchors.fill: parent`
`80`	`80`	`iconCode: IconCode.QUESTION_MARK`
`81`		`- visible: isIndeterminate`
	`81`	`+ visible: root.isIndeterminate`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`MouseArea {`
`@@ -89,7 +89,7 @@ Rectangle {`
`89`	`89`	`hoverEnabled: true`
`90`	`90`
`91`	`91`	`onClicked: {`
`92`		`- navigation.requestActiveByInteraction()`
	`92`	`+ navCtrl.requestActiveByInteraction()`
`93`	`93`
`94`	`94`	`prv.selectColor()`
`95`	`95`	`}`