From 3c66e0e8e26f53f8a81230fb65a4339e1e1ee88a Mon Sep 17 00:00:00 2001 From: Joachim Schmitz Date: Sat, 1 Dec 2018 18:35:00 +0100 Subject: [PATCH] fix #279165: LH Guitar fingering, "?" too much, "T" missing and an empty field in the master palette for fingering too much --- mscore/menus.cpp | 16 ++++++++-------- share/workspaces/Advanced.workspace | Bin 9002 -> 9002 bytes 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mscore/menus.cpp b/mscore/menus.cpp index c1daa944ed9e..3d31e207f2d9 100644 --- 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 lute { diff --git a/share/workspaces/Advanced.workspace b/share/workspaces/Advanced.workspace index a253547585533cef11dc755080e5447827d8f7c9..29eb6fd1a106b134e37dd7b7e21b227639276706 100644 GIT binary patch delta 3443 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 V000000{{a63IPBB3L*di005TTlXCz7 delta 3443 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