# HG changeset patch # User Chris Cannam # Date 1396425716 -3600 # Node ID e9a0b3fad71371e2331f51c661255a633ddb87a5 # Parent 271bea0f199bde1017e9152bcbab81c40f447b7d Remove tool-specific keyboard shortcut reference registration from Pane and put it in MainWindow (as it depends on which tools are in use) diff -r 271bea0f199b -r e9a0b3fad713 .hgsubstate --- a/.hgsubstate Wed Apr 02 08:33:40 2014 +0100 +++ b/.hgsubstate Wed Apr 02 09:01:56 2014 +0100 @@ -4,4 +4,4 @@ 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds dd07d48d7d4f7d033299a9142e04718b86c0ef1d svapp 8db820ad2b8f4f15b80e103d681f5a66c90983de svcore -09e2677e34e7156a1091fc37c4d24db6b83f5604 svgui +785c6f175ccce42b275cbc8ea53e6b237595ef18 svgui diff -r 271bea0f199b -r e9a0b3fad713 src/MainWindow.cpp --- a/src/MainWindow.cpp Wed Apr 02 08:33:40 2014 +0100 +++ b/src/MainWindow.cpp Wed Apr 02 09:01:56 2014 +0100 @@ -493,12 +493,11 @@ CommandHistory::getInstance()->registerToolbar(toolbar); + QActionGroup *group = new QActionGroup(this); + + IconLoader il; + m_keyReference->setCategory(tr("Tool Selection")); - - QActionGroup *group = new QActionGroup(this); - - IconLoader il; - QAction *action = toolbar->addAction(il.load("navigate"), tr("Navigate")); action->setCheckable(true); @@ -511,6 +510,19 @@ menu->addAction(action); m_keyReference->registerShortcut(action); + m_keyReference->setCategory + (tr("Navigate Tool Mouse Actions")); + m_keyReference->registerShortcut + (tr("Navigate"), tr("Left"), + tr("Click left button and drag to move around")); + m_keyReference->registerShortcut + (tr("Re-Analyse Area"), tr("Shift+Left"), + tr("Shift-click left button and drag to define a specific pitch and time range to re-analyse")); + m_keyReference->registerShortcut + (tr("Edit"), tr("Double-Click Left"), + tr("Double-click left button on an item to edit it")); + + m_keyReference->setCategory(tr("Tool Selection")); action = toolbar->addAction(il.load("move"), tr("Edit")); action->setCheckable(true); @@ -522,8 +534,25 @@ menu->addAction(action); m_keyReference->registerShortcut(action); + m_keyReference->setCategory + (tr("Note Edit Tool Mouse Actions")); + m_keyReference->registerShortcut + (tr("Adjust Pitch"), tr("Left"), + tr("Click left button on the main part of a note and drag to move it up or down")); + m_keyReference->registerShortcut + (tr("Split"), tr("Left"), + tr("Click left button on the bottom edge of a note to split it at the click point")); + m_keyReference->registerShortcut + (tr("Resize"), tr("Left"), + tr("Click left button on the left or right edge of a note and drag to change the time or duration of the note")); + m_keyReference->registerShortcut + (tr("Erase"), tr("Shift+Left"), + tr("Shift-click left button on a note to remove it")); + + /* Remove for now... + m_keyReference->setCategory(tr("Tool Selection")); action = toolbar->addAction(il.load("notes"), tr("Free Edit")); action->setCheckable(true);