# HG changeset patch
# User Chris Cannam
# Date 1296829996 0
# Node ID 94bb597df464ec5739af8d6dfedb709ce2777700
# Parent  065b61fe7cc3bf9989513e7feb572a823ced1b75# Parent  53d5e31770b458cdb0d566ad6384cf3e2b7bb78a
Merge

diff -r 53d5e31770b4 -r 94bb597df464 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Thu Feb 03 14:29:04 2011 +0000
+++ b/main/MainWindow.cpp	Fri Feb 04 14:33:16 2011 +0000
@@ -550,6 +550,15 @@
     menu->addAction(action);
     m_rightButtonMenu->addAction(action);
 
+    action = new QAction(tr("Paste at Playback Position"), this);
+    action->setShortcut(tr("Ctrl+Shift+V"));
+    action->setStatusTip(tr("Paste from the clipboard to the current layer, placing the first item at the playback position"));
+    connect(action, SIGNAL(triggered()), this, SLOT(pasteAtPlaybackPosition()));
+    connect(this, SIGNAL(canPaste(bool)), action, SLOT(setEnabled(bool)));
+    m_keyReference->registerShortcut(action);
+    menu->addAction(action);
+    m_rightButtonMenu->addAction(action);
+
     m_deleteSelectedAction = new QAction(tr("&Delete Selected Items"), this);
     m_deleteSelectedAction->setShortcut(tr("Del"));
     m_deleteSelectedAction->setStatusTip(tr("Delete items in current selection from the current layer"));