Mercurial > hg > tony

changeset 180:30045b51279b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author matthiasm
date Wed, 19 Feb 2014 09:02:01 +0000
parents 2eb71b65e4ef (current diff) 515bfde8aab7 (diff)
children cc68b5afd96c
files
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Feb 11 10:27:27 2014 +0000
+++ b/.hgsubstate	Wed Feb 19 09:02:01 2014 +0000
@@ -1,5 +1,5 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 27d4e7152c954bf3c4387319db088fb3cd02436b sv-dependency-builds
-f72d58d1ccb0736f4ab40853986d5952e0dd8321 svapp
+350a410e05551b78f5df02966c17ed35e2937067 svapp
 d81c16e47e22b1c1a6600d3e9a8e0559fad8b539 svcore
-d1c0abfb11bef9bf9af010a8468f6c2a717d36bb svgui
+62e7d4b378ae3d5e2e1558965733882c155cacab svgui
--- a/src/MainWindow.cpp	Tue Feb 11 10:27:27 2014 +0000
+++ b/src/MainWindow.cpp	Wed Feb 19 09:02:01 2014 +0000
@@ -535,7 +535,7 @@
     
     //!!! shortcuts, status tip, key reference etc
     action = new QAction(tr("Clear Pitches"), this);
-    action->setShortcut(tr("Backspace"));
+    action->setShortcut(tr("Ctrl+Backspace"));
     connect(action, SIGNAL(triggered()), this, SLOT(clearPitches()));
     connect(this, SIGNAL(canClearSelection(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);
@@ -555,7 +555,7 @@
     
     //!!! shortcuts, status tip, key reference etc
     action = new QAction(tr("Switch Pitch Candidate"), this);
-    action->setShortcut(tr("Return"));
+    action->setShortcut(tr("Ctrl+Return"));
     connect(action, SIGNAL(triggered()), this, SLOT(switchPitch()));
     connect(this, SIGNAL(canClearSelection(bool)), action, SLOT(setEnabled(bool)));
     menu->addAction(action);