# HG changeset patch
# User Chris Cannam
# Date 1396431328 -3600
# Node ID 72622fcdd12cdb82cad0e3d81e10d680d4fd8c44
# Parent  79ba5b50a40e75abbb6e4df64865466965430c7e
Shortcuts

diff -r 79ba5b50a40e -r 72622fcdd12c src/MainWindow.cpp
--- a/src/MainWindow.cpp	Wed Apr 02 09:47:27 2014 +0100
+++ b/src/MainWindow.cpp	Wed Apr 02 10:35:28 2014 +0100
@@ -653,7 +653,7 @@
     m_rightButtonMenu->addAction(action);
 
     action = new QAction(tr("Merge Notes"), this);
-    action->setShortcut(tr("Ctrl+="));
+    action->setShortcut(tr("Ctrl+\\"));
     action->setStatusTip(tr("Merge all notes within the selected region into a single note"));
     m_keyReference->registerShortcut(action);
     connect(action, SIGNAL(triggered()), this, SLOT(mergeNotes()));
@@ -662,6 +662,7 @@
     m_rightButtonMenu->addAction(action);
     
     action = new QAction(tr("Form Note from Selection"), this);
+    action->setShortcut(tr("Ctrl+="));
     action->setStatusTip(tr("Form a note spanning the selected region, splitting any existing notes at its boundaries"));
     m_keyReference->registerShortcut(action);
     connect(action, SIGNAL(triggered()), this, SLOT(formNoteFromSelection()));