fix #278320 Tablature staves reported as standard in instruments dialog

musescore · Nov 30, 2018 · 070f767 · 070f767
1 parent f290089
commit 070f767
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/mscore/instrwidget.cpp b/mscore/instrwidget.cpp
@@ -39,6 +39,10 @@
 
 namespace Ms {
 
+int StaffListItem::customStandardIdx;
+int StaffListItem::customPercussionIdx;
+int StaffListItem::customTablatureIdx;
+
 void filterInstruments(QTreeWidget *instrumentList, const QString &searchPhrase = QString());
 
 //---------------------------------------------------------
@@ -137,6 +141,13 @@ void StaffListItem::initStaffTypeCombo(bool forceRecreate)
                   }
             ++idx;
             }
+      customStandardIdx = _staffTypeCombo->count();
+      _staffTypeCombo->addItem(tr("Custom Standard"), 0);
+      customPercussionIdx = _staffTypeCombo->count();
+      _staffTypeCombo->addItem(tr("Custom Percussion"), 0);
+      customTablatureIdx = _staffTypeCombo->count();
+      _staffTypeCombo->addItem(tr("Custom Tablature"), 0);
+
       treeWidget()->setItemWidget(this, 4, _staffTypeCombo);
       connect(_staffTypeCombo, SIGNAL(currentIndexChanged(int)), SLOT(staffTypeChanged(int)) );
       }
@@ -196,8 +207,19 @@ void StaffListItem::setStaffType(const StaffType* st)
                         return;
                         }
                   }
-            qDebug("StaffListItem::setStaffType: not found\n");
-            _staffTypeCombo->setCurrentIndex(0);      // if none found, default to standard staff type
+            int idx = 0;
+            switch (st->group()) {
+                  case StaffGroup::STANDARD:
+                        idx = customStandardIdx;
+                        break;
+                  case StaffGroup::PERCUSSION:
+                        idx = customPercussionIdx;
+                        break;
+                  case StaffGroup::TAB:
+                        idx = customTablatureIdx;
+                        break;
+                  }
+            _staffTypeCombo->setCurrentIndex(idx);
             }
       }
 

diff --git a/mscore/instrwidget.h b/mscore/instrwidget.h
@@ -61,6 +61,9 @@ class StaffListItem : public QObject, public QTreeWidgetItem {
       QComboBox* _staffTypeCombo { nullptr };
       Staff* _staff              { 0       };
       ListItemOp _op             { ListItemOp::KEEP };
+      static int customStandardIdx;
+      static int customPercussionIdx;
+      static int customTablatureIdx;
 
    private slots:
       void staffTypeChanged(int);