fix #309192: Add advanced preference to remove letters from piano key…

…board also for the one in pianorol editor
Jojo-Schmitz · Nov 18, 2020 · 2496e6c · 2496e6c
1 parent c8a9dd7
commit 2496e6c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/global/settings/types/preferencekeys.h b/global/settings/types/preferencekeys.h
@@ -143,6 +143,7 @@
 #define PREF_UI_APP_SHOWSTATUSBAR                           "ui/application/showStatusBar"
 #define PREF_UI_APP_USENATIVEDIALOGS                        "ui/application/useNativeDialogs"
 #define PREF_UI_PIANO_HIGHLIGHTCOLOR                        "ui/piano/highlightColor"
+#define PREF_UI_PIANO_SHOWPITCHHELP                         "ui/piano/showPitchHelp"
 #define PREF_UI_SCORE_NOTE_DROPCOLOR                        "ui/score/note/dropColor"
 #define PREF_UI_SCORE_DEFAULTCOLOR                          "ui/score/defaultColor"
 #define PREF_UI_SCORE_FRAMEMARGINCOLOR                      "ui/score/frameMarginColor"

diff --git a/mscore/pianoroll/pianokeyboard.cpp b/mscore/pianoroll/pianokeyboard.cpp
@@ -22,6 +22,7 @@
 #include "libmscore/staff.h"
 #include "libmscore/part.h"
 #include "libmscore/drumset.h"
+#include "preferences.h"
 
 
 namespace Ms {
@@ -116,7 +117,7 @@ void PianoKeyboard::paintEvent(QPaintEvent* /*event*/)
                   QRectF rect(-_ypos + off2, 0, off2 - off1, height());
                   p.drawRect(rect);
 
-                  if (degree == 0 && noteHeight > fontSize + 2) {
+                  if (preferences.getBool(PREF_UI_PIANO_SHOWPITCHHELP) && degree == 0 && noteHeight > fontSize + 2) {
                         QRectF rectText(rect.x() + 1, rect.y(), rect.height() - 2, rect.width() - 2);
                         QTransform xform = p.transform();
                         p.rotate(90);
@@ -138,7 +139,7 @@ void PianoKeyboard::paintEvent(QPaintEvent* /*event*/)
 
                               p.drawText(rectText, Qt::AlignBottom | Qt::AlignLeft, noteName);
                               }
-                        else if (degree == 0) {
+                        else if (preferences.getBool(PREF_UI_PIANO_SHOWPITCHHELP) && degree == 0) {
                               QRectF rectText(rect.x(), rect.y(), rect.width() - 4, rect.height() - 1);
                               p.drawText(rectText, Qt::AlignRight | Qt::AlignBottom, noteName);
                               }

diff --git a/mscore/pianotools.cpp b/mscore/pianotools.cpp
@@ -399,7 +399,7 @@ void PianoKeyItem::paint(QPainter* p, const QStyleOptionGraphicsItem* /*o*/, QWi
       else
             p->setBrush(type >= 7 ? Qt::black : Qt::white);
       p->drawPath(path());
-      if (_pitch % 12 == 0) {
+      if (preferences.getBool(PREF_UI_PIANO_SHOWPITCHHELP) && _pitch % 12 == 0) {
             QFont f("Edwin", 6);
             p->setFont(f);
             QString text = "C" + QString::number((_pitch / 12) - 1);

diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp
@@ -237,6 +237,7 @@ void Preferences::init(bool storeInMemoryOnly)
             {PREF_UI_APP_SHOWSTATUSBAR,                            new BoolPreference(true)},
             {PREF_UI_APP_USENATIVEDIALOGS,                         new BoolPreference(true)},
             {PREF_UI_PIANO_HIGHLIGHTCOLOR,                         new ColorPreference(QColor(0x0065BF))},
+            {PREF_UI_PIANO_SHOWPITCHHELP,                          new BoolPreference(true)},
             {PREF_UI_SCORE_NOTE_DROPCOLOR,                         new ColorPreference(QColor(0x0065BF))},
             {PREF_UI_SCORE_DEFAULTCOLOR,                           new ColorPreference(QColor(Qt::black))}, //"#000000"
             {PREF_UI_SCORE_FRAMEMARGINCOLOR,                       new ColorPreference(QColor(0xA0A0A4))},
@@ -600,6 +601,7 @@ QMap<QString, QVariant> Preferences::getDefaultLocalPreferences() {
                         PREF_UI_APP_SHOWSTATUSBAR,
                         PREF_UI_APP_USENATIVEDIALOGS,
                         PREF_UI_PIANO_HIGHLIGHTCOLOR,
+                        PREF_UI_PIANO_SHOWPITCHHELP,
                         PREF_UI_SCORE_NOTE_DROPCOLOR,
                         PREF_UI_SCORE_DEFAULTCOLOR,
                         PREF_UI_SCORE_FRAMEMARGINCOLOR,