Moved "Make/Undo Soloist" button to instrument line to make room for order names.

njvdberg · njvdberg · commit 3601da484f13 · 2021-05-13T20:46:54.000+02:00
Form will show initial "soloist" status and implements soloist toggling.
diff --git a/src/instruments/qml/MuseScore/Instruments/ChooseInstrumentsPage.qml b/src/instruments/qml/MuseScore/Instruments/ChooseInstrumentsPage.qml
@@ -220,6 +220,10 @@ Rectangle {
             onOrderChanged: {
                 instrumentsModel.selectOrderType(id)
             }
+
+            onSoloistChanged: {
+                instrumentsModel.toggleSoloist(id)
+            }
         }
 
         SeparatorLine {
diff --git a/src/instruments/qml/MuseScore/Instruments/internal/SelectedInstrumentsView.qml b/src/instruments/qml/MuseScore/Instruments/internal/SelectedInstrumentsView.qml
@@ -43,11 +43,24 @@ Item {
 
     signal unselectInstrumentRequested(string id)
     signal orderChanged(string id)
+    signal soloistChanged(string id)
 
     function scrollViewToEnd() {
         instrumentsView.positionViewAtEnd()
     }
 
+    function soloistsButtonText(soloist) {
+        return soloist ? qsTrc("instruments", "Undo soloist") : qsTrc("instruments", "Make soloist")
+    }
+
+    function instrumentName(data) {
+        var name = data.name
+        if (data.soloist) {
+            name = qsTrc("instruments", "Soloist: ") + name
+        }
+        return name
+    }
+
     NavigationPanel {
         id: navPanel
         name: "SelectedInstrumentsView"
@@ -99,17 +112,6 @@ Item {
             }
         }
 
-        FlatButton {
-            Layout.preferredWidth: width
-
-            navigation.name: "Make soloist"
-            navigation.panel: navPanel
-            navigation.row: 2
-
-            enabled: root.isInstrumentSelected
-            text: qsTrc("instruments", "Make soloist")
-        }
-
         FlatButton {
             Layout.preferredWidth: width
 
@@ -163,10 +165,25 @@ Item {
                 anchors.verticalCenter: parent.verticalCenter
 
                 horizontalAlignment: Text.AlignLeft
-                text: modelData.name
+                text: instrumentName(modelData)
                 font: ui.theme.bodyBoldFont
             }
 
+            FlatButton {
+                anchors.right: parent.right
+                anchors.leftMargin: 4
+                anchors.rightMargin: 4
+                anchors.verticalCenter: parent.verticalCenter
+
+                visible: root.currentInstrumentIndex === index
+
+                text: soloistsButtonText(modelData.soloist)
+
+                onClicked: {
+                    soloistChanged(modelData.id)
+                }
+            }
+
             onClicked: {
                 root.currentInstrumentIndex = model.index
             }
diff --git a/src/instruments/view/instrumentlistmodel.cpp b/src/instruments/view/instrumentlistmodel.cpp
@@ -36,6 +36,8 @@ static const QString NAME_KEY("name");
 static const QString TRANSPOSITIONS_KEY("transpositions");
 static const QString GROUP_ID("groupId");
 static const QString CONFIG_KEY("config");
+static const QString SOLOIST_KEY("soloist");
+static const QString PART_KEY("part");
 
 InstrumentListModel::InstrumentListModel(QObject* parent)
     : QObject(parent)
@@ -90,10 +92,10 @@ void InstrumentListModel::initSelectedInstruments(const IDList& selectedPartIds)
 
         SelectedInstrumentInfo info;
 
-        info.partId = partId;
-        info.partName = part->partName();
-
-        info.id = QString();
+        info.id = partId;
+        info.part = true;
+        info.name = part->partName();
+        info.soloist = part->soloist();
         info.config = Instrument();
 
         m_selectedInstruments << info;
@@ -276,8 +278,7 @@ void InstrumentListModel::selectInstrument(const QString& instrumentId, const QS
     SelectedInstrumentInfo info;
     info.part = false;
     info.id = codeKey;
-    info.partId = QString();
-    info.partName = QString();
+    info.name = QString();
     info.transposition = templ.transposition;
     info.config = templ.instrument;
 
@@ -289,9 +290,16 @@ void InstrumentListModel::selectInstrument(const QString& instrumentId, const QS
     emit selectedInstrumentsChanged();
 }
 
-void InstrumentListModel::makeSoloist(const QString&)
+void InstrumentListModel::toggleSoloist(const QString& instrumentId)
 {
-    NOT_IMPLEMENTED;
+    for (int i = 0; i < m_selectedInstruments.count(); ++i) {
+        if (m_selectedInstruments[i].id == instrumentId) {
+            SelectedInstrumentInfo info = m_selectedInstruments[i];
+            m_selectedInstruments[i].soloist = !m_selectedInstruments[i].soloist;
+            emit selectedInstrumentsChanged();
+            return;
+        }
+    }
 }
 
 void InstrumentListModel::unselectInstrument(const QString& instrumentId)
@@ -347,23 +355,29 @@ QVariantList InstrumentListModel::selectedInstruments() const
     QVariantList result;
 
     for (const SelectedInstrumentInfo& instrument: m_selectedInstruments) {
-        QString instrumentId = instrument.id;
-        QString instrumentName = instrument.partName;
-
-        if (instrumentName.isEmpty()) {
-            instrumentName = instrument.config.name;
+        QString id = instrument.id;
+        QString name = instrument.name;
+        bool soloist = instrument.soloist;
+        bool part = instrument.part;
+
+        if (!part) {
+            id = instrument.id;
+            name = instrument.config.name;
+            soloist = false;
             Transposition _transposition = instrument.transposition;
             if (_transposition.isValid()) {
-                instrumentName = instrumentName.replace(_transposition.name + " ", "")
+                name = name.replace(_transposition.name + " ", "")
                                  .replace(" in " + _transposition.name, "");
 
-                instrumentName = QString("%1 (%2)").arg(instrumentName, _transposition.name);
+                name = QString("%1 (%2)").arg(name, _transposition.name);
             }
         }
 
         QVariantMap obj;
-        obj[ID_KEY] = instrumentId;
-        obj[NAME_KEY] = instrumentName;
+        obj[PART_KEY] = part;
+        obj[ID_KEY] = id;
+        obj[NAME_KEY] = name;
+        obj[SOLOIST_KEY] = soloist;
         obj[CONFIG_KEY] = QVariant::fromValue(instrument.config);
 
         result << obj;
diff --git a/src/instruments/view/instrumentlistmodel.h b/src/instruments/view/instrumentlistmodel.h
@@ -60,7 +60,7 @@ class InstrumentListModel : public QObject, public async::Asyncable
     Q_INVOKABLE void selectInstrument(const QString& instrumentId, const QString& transpositionId = QString());
     Q_INVOKABLE void unselectInstrument(const QString& instrumentId);
     Q_INVOKABLE void swapSelectedInstruments(int firstIndex, int secondIndex);
-    Q_INVOKABLE void makeSoloist(const QString& instrumentId);
+    Q_INVOKABLE void toggleSoloist(const QString& instrumentId);
 
     Q_INVOKABLE void setSearchText(const QString& text);
 
@@ -110,8 +110,9 @@ class InstrumentListModel : public QObject, public async::Asyncable
     struct SelectedInstrumentInfo
     {
         QString id;
-        QString partId;
-        QString partName;
+        QString name;
+        bool soloist;
+        bool part;
         Transposition transposition;
         Instrument config;
 
diff --git a/src/notation/internal/notationparts.cpp b/src/notation/internal/notationparts.cpp
@@ -133,6 +133,7 @@ void NotationParts::setParts(const mu::instruments::PartInstrumentList& parts)
 {
     removeMissingParts(parts);
     appendNewParts(parts);
+    updateSoloist(parts);
 
     sortParts(parts);
 
@@ -715,12 +716,6 @@ void NotationParts::doRemoveParts(const IDList& partsIds)
     for (const ID& partId: partsIds) {
         score()->cmdRemovePart(part(partId));
     }
-
-    for (Ms::Excerpt* excerpt : masterScore()->excerpts()) {
-        if (excerpt->partScore()->staves().size() == 0) {
-            masterScore()->undo(new Ms::RemoveExcerpt(excerpt));
-        }
-    }
 }
 
 void NotationParts::removeInstruments(const IDList& instrumentIds, const ID& fromPartId)
@@ -1233,7 +1228,7 @@ void NotationParts::removeMissingParts(const PartInstrumentList& parts)
 
     for (const Part* part: partList()) {
         if (partIds.contains(part->id())) {
-                continue;
+            continue;
         }
         partsToRemove << part->id();
 
@@ -1252,13 +1247,23 @@ void NotationParts::appendNewParts(const PartInstrumentList& parts)
         Part* part = new Part(score());
 
         part->setPartName(pi.instrument.name);
+        part->setSoloist(pi.soloist);
         part->setInstrument(InstrumentsConverter::convertInstrument(pi.instrument));
 
         score()->undo(new Ms::InsertPart(part, lastStaffIndex()));
         appendStaves(part, pi.instrument);
     }
 }
 
+void NotationParts::updateSoloist(const PartInstrumentList& parts)
+{
+    for (const PartInstrument& pi: parts) {
+        if (pi.part) {
+            part(pi.partId)->setSoloist(pi.soloist);
+        }
+    }
+}
+
 void NotationParts::sortParts(const PartInstrumentList& parts)
 {
     Q_ASSERT(score()->parts().size() == static_cast<int>(parts.size()));
diff --git a/src/notation/internal/notationparts.h b/src/notation/internal/notationparts.h
@@ -151,6 +151,7 @@ class NotationParts : public INotationParts, public async::Asyncable
 
     void removeMissingParts(const instruments::PartInstrumentList& parts);
     void appendNewParts(const instruments::PartInstrumentList& parts);
+    void updateSoloist(const instruments::PartInstrumentList& parts);
     void sortParts(const instruments::PartInstrumentList& parts);
 
     IDList allInstrumentsIds() const;

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,10 @@ Rectangle {`
`220`	`220`	`onOrderChanged: {`
`221`	`221`	`instrumentsModel.selectOrderType(id)`
`222`	`222`	`}`
	`223`	`+`
	`224`	`+ onSoloistChanged: {`
	`225`	`+ instrumentsModel.toggleSoloist(id)`
	`226`	`+ }`
`223`	`227`	`}`
`224`	`228`
`225`	`229`	`SeparatorLine {`