Merge 35bacbbace into 2187c061bf

c++/widgets/pixmapkeyboard.cpp

@@ -64,7 +64,7 @@ static std::map<int, QRectF> kMidiKey2RectMapVertical = {
 static std::map<int, int> kMidiKeyboard2KeyMap;
 #else
 static const std::map<int, int> kMidiKeyboard2KeyMap = {
-    // 3th octave
+    // bottom row, 3rd octave
     {Qt::Key_Z, 48},
     {Qt::Key_S, 49},
     {Qt::Key_X, 50},
@@ -77,7 +77,7 @@ static const std::map<int, int> kMidiKeyboard2KeyMap = {
     {Qt::Key_N, 57},
     {Qt::Key_J, 58},
     {Qt::Key_M, 59},
-    // 4th octave
+    // top row, 4th octave
     {Qt::Key_Q, 60},
     {Qt::Key_2, 61},
     {Qt::Key_W, 62},
@@ -89,7 +89,13 @@ static const std::map<int, int> kMidiKeyboard2KeyMap = {
     {Qt::Key_6, 68},
     {Qt::Key_Y, 69},
     {Qt::Key_7, 70},
-    {Qt::Key_U, 71}
+    {Qt::Key_U, 71},
+    // continue the top row in to the 5th octave
+    {Qt::Key_I, 72},
+    {Qt::Key_9, 73},
+    {Qt::Key_O, 74},
+    {Qt::Key_0, 75},
+    {Qt::Key_P, 76}
 };
 #endif
 
@@ -156,6 +162,12 @@ static const struct PixmapKeyboardInit {
         kMidiKeyboard2KeyMap[Qt::Key_Y] = 69;
         kMidiKeyboard2KeyMap[Qt::Key_7] = 70;
         kMidiKeyboard2KeyMap[Qt::Key_U] = 71;
+        // kMidiKeyboard2KeyMap, 5th octave
+        kMidiKeyboard2KeyMap[Qt::Key_I] = 72;
+        kMidiKeyboard2KeyMap[Qt::Key_9] = 73;
+        kMidiKeyboard2KeyMap[Qt::Key_O] = 74;
+        kMidiKeyboard2KeyMap[Qt::Key_0] = 75;
+        kMidiKeyboard2KeyMap[Qt::Key_P] = 76;
 
         // kBlackNotes
         kBlackNotes << 1;