Merge pull request #25019 from chilkaditya/feat/restoring-instruments…

…-list Feat: Restoring instruments list while switching back and forth between in instruments and templates
musescore · Oct 24, 2024 · 0697944 · 0697944
2 parents 4a91259 + 7939be9
commit 0697944
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 50 deletions.
diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/ChooseInstrumentsPage.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/ChooseInstrumentsPage.qml
@@ -31,13 +31,15 @@ import "internal"
 Rectangle {
     id: root
 
+    required property InstrumentsOnScoreListModel instrumentsOnScoreModel
+
     property bool canSelectMultipleInstruments: true
     property string currentInstrumentId: ""
     property string description: instrumentsModel.selectedInstrument ? instrumentsModel.selectedInstrument.description : ""
 
-    property bool hasSelectedInstruments: root.canSelectMultipleInstruments
-                                          ? instrumentsOnScoreView.hasInstruments
-                                          : Boolean(instrumentsModel.selectedInstrument)
+    readonly property bool hasSelectedInstruments: root.canSelectMultipleInstruments
+                                                   ? instrumentsOnScoreModel.count > 0
+                                                   : Boolean(instrumentsModel.selectedInstrument)
 
     property NavigationSection navigationSection: null
 
@@ -47,15 +49,15 @@ Rectangle {
 
     function instruments() {
         if (root.canSelectMultipleInstruments) {
-            return instrumentsOnScoreView.instruments()
+            return root.instrumentsOnScoreModel.instruments()
         }
 
         return [ instrumentsModel.selectedInstrument ]
     }
 
     function currentOrder() {
         if (root.canSelectMultipleInstruments) {
-            return instrumentsOnScoreView.currentOrder()
+            return root.instrumentsOnScoreModel.currentOrder()
         }
 
         return undefined
@@ -80,7 +82,7 @@ Rectangle {
         id: prv
 
         function addSelectedInstrumentsToScore() {
-            instrumentsOnScoreView.addInstruments(instrumentsModel.selectedInstrumentIdList())
+            root.instrumentsOnScoreModel.addInstruments(instrumentsModel.selectedInstrumentIdList())
 
             Qt.callLater(instrumentsOnScoreView.scrollViewToEnd)
         }
@@ -201,6 +203,8 @@ Rectangle {
 
             Layout.fillWidth: true
             Layout.fillHeight: true
+
+            instrumentsOnScoreModel: root.instrumentsOnScoreModel
         }
 
         SeparatorLine {
@@ -226,7 +230,7 @@ Rectangle {
             }
 
             FlatButton {
-                enabled: instrumentsOnScoreView.isMovingUpAvailable
+                enabled: root.instrumentsOnScoreModel.isMovingUpAvailable
                 icon: IconCode.ARROW_UP
 
                 navigation.name: "Up"
@@ -236,12 +240,12 @@ Rectangle {
                 toolTipTitle: qsTrc("instruments", "Move selected instruments up")
 
                 onClicked: {
-                    instrumentsOnScoreView.moveSelectedInstrumentsUp()
+                    root.instrumentsOnScoreModel.moveSelectionUp()
                 }
             }
 
             FlatButton {
-                enabled: instrumentsOnScoreView.isMovingDownAvailable
+                enabled: root.instrumentsOnScoreModel.isMovingDownAvailable
                 icon: IconCode.ARROW_DOWN
 
                 navigation.name: "Down"
@@ -251,7 +255,7 @@ Rectangle {
                 toolTipTitle: qsTrc("instruments", "Move selected instruments down")
 
                 onClicked: {
-                    instrumentsOnScoreView.moveSelectedInstrumentsDown()
+                    root.instrumentsOnScoreModel.moveSelectionDown()
                 }
             }
         }

diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsDialog.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/InstrumentsDialog.qml
@@ -52,6 +52,14 @@ StyledDialogView {
         root.hide()
     }
 
+    Component.onCompleted: {
+        theInstrumentsOnScoreModel.load()
+    }
+
+    InstrumentsOnScoreListModel {
+        id: theInstrumentsOnScoreModel
+    }
+
     ColumnLayout {
         anchors.fill: parent
         spacing: 20
@@ -70,6 +78,8 @@ StyledDialogView {
             onSubmitRequested: {
                 root.submit()
             }
+
+            instrumentsOnScoreModel: theInstrumentsOnScoreModel
         }
 
         RowLayout {

diff --git a/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsOnScoreView.qml b/src/instrumentsscene/qml/MuseScore/InstrumentsScene/internal/InstrumentsOnScoreView.qml
@@ -30,44 +30,14 @@ import MuseScore.InstrumentsScene 1.0
 Item {
     id: root
 
-    readonly property bool hasInstruments: instrumentsOnScoreModel.count > 0
-    readonly property alias isMovingUpAvailable: instrumentsOnScoreModel.isMovingUpAvailable
-    readonly property alias isMovingDownAvailable: instrumentsOnScoreModel.isMovingDownAvailable
+    required property InstrumentsOnScoreListModel instrumentsOnScoreModel
 
     property alias navigation: instrumentsView.navigation
 
-    function instruments() {
-        return instrumentsOnScoreModel.instruments()
-    }
-
-    function currentOrder() {
-        return instrumentsOnScoreModel.currentOrder()
-    }
-
-    function addInstruments(instruments) {
-        instrumentsOnScoreModel.addInstruments(instruments)
-    }
-
-    function moveSelectedInstrumentsUp() {
-        instrumentsOnScoreModel.moveSelectionUp()
-    }
-
-    function moveSelectedInstrumentsDown() {
-        instrumentsOnScoreModel.moveSelectionDown()
-    }
-
     function scrollViewToEnd() {
         instrumentsView.positionViewAtEnd()
     }
 
-    InstrumentsOnScoreListModel {
-        id: instrumentsOnScoreModel
-    }
-
-    Component.onCompleted: {
-        instrumentsOnScoreModel.load()
-    }
-
     StyledTextLabel {
         id: instrumentsLabel
 
@@ -96,14 +66,14 @@ Item {
             navigation.row: 0
             navigation.column: 0
 
-            model: instrumentsOnScoreModel.orders
+            model: root.instrumentsOnScoreModel.orders
 
-            currentIndex: instrumentsOnScoreModel.currentOrderIndex
+            currentIndex: root.instrumentsOnScoreModel.currentOrderIndex
 
             displayText: qsTrc("instruments", "Order:") + " " + currentText
 
             onActivated: function(index, value) {
-                instrumentsOnScoreModel.currentOrderIndex = index
+                root.instrumentsOnScoreModel.currentOrderIndex = index
             }
         }
 
@@ -118,10 +88,10 @@ Item {
             icon: IconCode.DELETE_TANK
             toolTipTitle: qsTrc("instruments", "Remove selected instruments from score")
 
-            enabled: instrumentsOnScoreModel.isRemovingAvailable
+            enabled: root.instrumentsOnScoreModel.isRemovingAvailable
 
             onClicked: {
-                instrumentsOnScoreModel.removeSelection()
+                root.instrumentsOnScoreModel.removeSelection()
             }
         }
     }
@@ -135,7 +105,7 @@ Item {
         anchors.left: parent.left
         anchors.right: parent.right
 
-        model: instrumentsOnScoreModel
+        model: root.instrumentsOnScoreModel
 
         accessible.name: instrumentsLabel.text
 
@@ -187,15 +157,15 @@ Item {
             }
 
             onClicked: {
-                instrumentsOnScoreModel.selectRow(model.index)
+                root.instrumentsOnScoreModel.selectRow(model.index)
             }
 
             onDoubleClicked: {
-                instrumentsOnScoreModel.removeSelection()
+                root.instrumentsOnScoreModel.removeSelection()
             }
 
             onRemoveSelectionRequested: {
-                instrumentsOnScoreModel.removeSelection()
+                root.instrumentsOnScoreModel.removeSelection()
             }
         }
     }

diff --git a/src/project/qml/MuseScore/Project/internal/NewScore/ChooseInstrumentsAndTemplatesPage.qml b/src/project/qml/MuseScore/Project/internal/NewScore/ChooseInstrumentsAndTemplatesPage.qml
@@ -75,6 +75,14 @@ Item {
         pageLoader.item.navigation.requestActive()
     }
 
+    Component.onCompleted: {
+        theInstrumentsOnScoreModel.load()
+    }
+
+    InstrumentsOnScoreListModel {
+        id: theInstrumentsOnScoreModel
+    }
+
     StyledTabBar {
         id: bar
 
@@ -168,6 +176,7 @@ Item {
 
         ChooseInstrumentsPage {
             navigationSection: root.navigationSection
+            instrumentsOnScoreModel: theInstrumentsOnScoreModel
         }
     }