Let user specify custom instruments XML in Preferences > Folders

Replacing the fields for instruments / score order XML files in Preferences > Score.

Author: cbjeukendrup

src/appshell/appshell.qrc

@@ -90,7 +90,7 @@
         <file>qml/Preferences/internal/NoteInput/VoiceAssignmentSection.qml</file>
         <file>qml/Preferences/internal/NoteInput/NoteColorsSection.qml</file>
         <file>qml/Preferences/internal/NoteInput/FretboardDiagramsSection.qml</file>
-        <file>qml/Preferences/internal/DefaultFilesSection.qml</file>
+        <file>qml/Preferences/internal/DefaultStyleSection.qml</file>
         <file>qml/Preferences/internal/AutomaticUpdateSection.qml</file>
         <file>qml/platform/win/AppTitleBar.qml</file>
         <file>qml/DevTools/MPE/ArticulationsProfileEditorView.qml</file>

src/appshell/qml/Preferences/ScorePreferencesPage.qml

@@ -37,7 +37,7 @@ PreferencesPage {
         scorePreferencesModel.load()
     }
 
-    DefaultFilesSection {
+    DefaultStyleSection {
         width: parent.width
 
         model: scorePreferencesModel

src/appshell/qml/Preferences/internal/DefaultFilesSection.qml

@@ -0,0 +1,96 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ * MuseScore-Studio-CLA-applies
+ *
+ * MuseScore Studio
+ * Music Composition & Notation
+ *
+ * Copyright (C) 2021 MuseScore Limited
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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
+
+import Muse.Ui 1.0
+import Muse.UiComponents 1.0
+import MuseScore.Preferences 1.0
+
+BaseSection {
+    id: root
+
+    title: qsTrc("appshell/preferences", "Default style")
+
+    navigation.direction: NavigationPanel.Both
+
+    property ScorePreferencesModel model: null
+
+    GridLayout {
+        width: parent.width
+        columns: 2
+        columnSpacing: root.columnSpacing
+        rowSpacing: 4
+
+        StyledTextLabel {
+            id: styleLabel
+            Layout.preferredWidth: root.columnWidth
+            text: qsTrc("appshell/preferences/score", "Style for full score")
+            horizontalAlignment: Text.AlignLeft
+        }
+
+        FilePicker {
+            Layout.fillWidth: true
+
+            dialogTitle: qsTrc("appshell/preferences/score", "Choose default style for full score")
+            filter: qsTrc("appshell/preferences/score", "MuseScore style file") + " (*.mss)"
+            dir: root.model ? root.model.defaultStylePath : ""
+            path: root.model ? root.model.defaultStylePath : ""
+
+            navigation: root.navigation
+            navigationRowOrderStart: 0
+            pathFieldTitle: styleLabel.text
+
+            onPathEdited: function(newPath) {
+                if (root.model) {
+                    root.model.defaultStylePath = newPath
+                }
+            }
+        }
+
+        StyledTextLabel {
+            id: partStyleLabel
+            Layout.preferredWidth: root.columnWidth
+            text: qsTrc("appshell/preferences", "Style for parts")
+            horizontalAlignment: Text.AlignLeft
+        }
+
+        FilePicker {
+            Layout.fillWidth: true
+
+            dialogTitle: qsTrc("appshell/preferences", "Choose default style for parts")
+            filter: qsTrc("appshell/preferences", "MuseScore style file") + " (*.mss)"
+            dir: root.model ? root.model.defaultPartStylePath : ""
+            path: root.model ? root.model.defaultPartStylePath : ""
+
+            navigation: root.navigation
+            navigationRowOrderStart: 1
+            pathFieldTitle: partStyleLabel.text
+
+            onPathEdited: function(newPath) {
+                if (root.model) {
+                    root.model.defaultPartStylePath = newPath
+                }
+            }
+        }
+    }
+}

src/appshell/qml/Preferences/internal/DefaultStyleSection.qml

@@ -95,6 +95,11 @@ void FoldersPreferencesModel::load()
             FolderType::Styles, muse::qtrc("appshell/preferences", "Styles"), notationConfiguration()->userStylesPath().toQString(),
             notationConfiguration()->userStylesPath().toQString()
         },
+        {
+            FolderType::Instruments, muse::qtrc("appshell/preferences", "Instruments and score orders"),
+            notationConfiguration()->userInstrumentsFolder().toQString(),
+            notationConfiguration()->userInstrumentsFolder().toQString()
+        },
         {
             FolderType::Templates, muse::qtrc("appshell/preferences", "Templates"), projectConfiguration()->userTemplatesPath().toQString(),
             projectConfiguration()->userTemplatesPath().toQString()
@@ -136,6 +141,10 @@ void FoldersPreferencesModel::setupConnections()
         setFolderPaths(FolderType::Styles, path.toQString());
     });
 
+    notationConfiguration()->userInstrumentsFolderChanged().onReceive(this, [this](const muse::io::path_t& path) {
+        setFolderPaths(FolderType::Instruments, path.toQString());
+    });
+
     projectConfiguration()->userTemplatesPathChanged().onReceive(this, [this](const muse::io::path_t& path) {
         setFolderPaths(FolderType::Templates, path.toQString());
     });
@@ -171,6 +180,11 @@ void FoldersPreferencesModel::saveFolderPaths(FoldersPreferencesModel::FolderTyp
         notationConfiguration()->setUserStylesPath(folderPath);
         break;
     }
+    case FolderType::Instruments: {
+        muse::io::path_t folderPath = paths.toStdString();
+        notationConfiguration()->setUserInstrumentsFolder(folderPath);
+        break;
+    }
     case FolderType::Templates: {
         muse::io::path_t folderPath = paths.toStdString();
         projectConfiguration()->setUserTemplatesPath(folderPath);

src/appshell/view/preferences/folderspreferencesmodel.cpp

@@ -68,6 +68,7 @@ class FoldersPreferencesModel : public QAbstractListModel, public muse::Injectab
         Undefined,
         Scores,
         Styles,
+        Instruments,
         Templates,
         Plugins,
         SoundFonts,