Merge pull request #4274 from Jojo-Schmitz/fingering

fix #279165: LH Guitar fingering, "?" too much, "T" missing
musescore · Dec 3, 2018 · cffdaee · cffdaee
2 parents 312a128 + 3c66e0e
commit cffdaee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mscore/menus.cpp b/mscore/menus.cpp
@@ -476,17 +476,17 @@ Palette* MuseScore::newFingeringPalette()
             f->setXmlText(QString(finger[i]));
             sp->append(f, tr("RH Guitar Fingering %1").arg(finger[i]));
             }
-      for (char c : "012345") {
+      finger = "012345T";
+      for (unsigned i = 0; i < strlen(finger); ++i) {
             Fingering* f = new Fingering(gscore, Tid::LH_GUITAR_FINGERING);
-            f->setXmlText(QString(c));
-            sp->append(f, tr("LH Guitar Fingering %1").arg(c));
+            f->setXmlText(QString(finger[i]));
+            sp->append(f, tr("LH Guitar Fingering %1").arg(finger[i]));
             }
-
-      const char* stringnumber = "0123456";
-      for (unsigned i = 0; i < strlen(stringnumber); ++i) {
+      finger = "0123456";
+      for (unsigned i = 0; i < strlen(finger); ++i) {
             Fingering* f = new Fingering(gscore, Tid::STRING_NUMBER);
-            f->setXmlText(QString(stringnumber[i]));
-            sp->append(f, tr("String number %1").arg(stringnumber[i]));
+            f->setXmlText(QString(finger[i]));
+            sp->append(f, tr("String number %1").arg(finger[i]));
             }
 
       static const std::vector<SymId> lute {

diff --git a/share/workspaces/Advanced.workspace b/share/workspaces/Advanced.workspace