fix #235406: standard keyboard shortcuts missing

small changes minor change formatting fixes all shortcuts are now displayed in prefs dialog minor change formatting fix small change changed length to size
musescore · Aug 8, 2017 · 99a9c65 · 99a9c65
1 parent f46efb7
commit 99a9c65
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp
@@ -3539,6 +3539,17 @@ void Shortcut::setKeys(const QList<QKeySequence>& ks)
             _action->setShortcuts(_keys);
       }
 
+//---------------------------------------------------------
+//   setStandardKey
+//---------------------------------------------------------
+
+void Shortcut::setStandardKey(QKeySequence::StandardKey k)
+      {
+      _standardKey = k;
+      if (_action && k != QKeySequence::UnknownKey)
+            _action->setShortcuts(_standardKey);
+      }
+
 //---------------------------------------------------------
 //   descr
 //---------------------------------------------------------
@@ -3669,6 +3680,14 @@ QString Shortcut::keysToString() const
                   s += "; ";
             s += Shortcut::keySeqToString(_keys[i], QKeySequence::NativeText);
             }
+      if (s.isEmpty() && _standardKey != QKeySequence::UnknownKey) {
+            QList<QKeySequence> keySeqList = QKeySequence::keyBindings(_standardKey);
+            for (int i = 0; i < keySeqList.size(); i++) {
+                  if (i)
+                        s += "; ";
+                  s += Shortcut::keySeqToString(keySeqList[i], QKeySequence::NativeText);
+                  }
+            }
       return s;
       }
 

diff --git a/mscore/shortcut.h b/mscore/shortcut.h
@@ -151,7 +151,7 @@ class Shortcut {
       Icons icon() const                       { return _icon;  }
       const QList<QKeySequence>& keys() const  { return _keys;  }
       QKeySequence::StandardKey standardKey() const { return _standardKey; }
-      void setStandardKey(QKeySequence::StandardKey k) {  _standardKey = k; }
+      void setStandardKey(QKeySequence::StandardKey k);
       void setKeys(const QList<QKeySequence>& ks);
 
       bool compareKeys(const Shortcut&) const;