summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets/canvas.cpp
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2013-03-04 19:44:48 +0000
committerRobert Jonsson <spamatica@gmail.com>2013-03-04 19:44:48 +0000
commit0cbda2ef8898f4e6333407c64e662d6e087878fa (patch)
treea7e5b99664df29a2f0a3c23ee0bff2bc9a377e3c /muse2/muse/widgets/canvas.cpp
parent8c3f10f97d58e596a2ecd1c5c2280d2b6b7f5e11 (diff)
print shortcuts for tools
Diffstat (limited to 'muse2/muse/widgets/canvas.cpp')
-rw-r--r--muse2/muse/widgets/canvas.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/muse2/muse/widgets/canvas.cpp b/muse2/muse/widgets/canvas.cpp
index 51612884..f29e4d63 100644
--- a/muse2/muse/widgets/canvas.cpp
+++ b/muse2/muse/widgets/canvas.cpp
@@ -48,6 +48,7 @@
#include "part.h"
#include "fastlog.h"
#include "menutitleitem.h"
+#include "shortcuts.h"
#define ABS(x) ((x) < 0) ? -(x) : (x)
@@ -1644,7 +1645,12 @@ QMenu* Canvas::genCanvasPopup(QMenu* menu)
if ((canvasTools & (1 << i))==0)
continue;
QAction* act = r_menu->addAction(QIcon(**toolList[i].icon), tr(toolList[i].tip));
- act->setData(TOOLS_ID_BASE + i);
+
+ if (MusEGui::toolShortcuts.contains(1 << i)) {
+ act->setShortcut(MusEGui::shortcuts[MusEGui::toolShortcuts[1 << i]].key);
+ }
+ //
+ act->setData(TOOLS_ID_BASE + i);
act->setCheckable(true);
act->setChecked((1 << i) == _tool);
if (!act0)