Mercurial > hg > svgui
diff widgets/KeyReference.h @ 771:a964151832a7
Merge from branch tony_integration
author | Chris Cannam |
---|---|
date | Wed, 14 May 2014 09:54:34 +0100 |
parents | a31c8ee2e17e |
children | 05d614f6e46d |
line wrap: on
line diff
--- a/widgets/KeyReference.h Sat Apr 12 01:07:05 2014 -0700 +++ b/widgets/KeyReference.h Wed May 14 09:54:34 2014 +0100 @@ -20,6 +20,7 @@ #include <QString> #include <vector> #include <map> +#include <QKeySequence> class QAction; class QTextEdit; @@ -38,9 +39,11 @@ void registerShortcut(QAction *, QString overrideName = ""); void registerAlternativeShortcut(QAction *, QString alternative); + void registerAlternativeShortcut(QAction *, QKeySequence alternative); void registerShortcut(QString actionName, QString shortcut, QString tipText); void registerAlternativeShortcut(QString actionName, QString alternative); + void registerAlternativeShortcut(QString actionName, QKeySequence alternative); void show(); void hide();