From 47cbc9e7f92833ec223061789ed1a68969b1b15c Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Mon, 8 Dec 2014 22:58:11 +0100
Subject: [PATCH] AutomationEditor + PianoRoll: Move Copy/Paste shortcuts

---
 src/gui/AutomationEditor.cpp | 50 ++++++++----------------------------
 src/gui/PianoRoll.cpp        | 40 +++--------------------------
 2 files changed, 14 insertions(+), 76 deletions(-)

diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp
index b1d1d49f9..9838140ea 100644
--- a/src/gui/AutomationEditor.cpp
+++ b/src/gui/AutomationEditor.cpp
@@ -324,29 +324,6 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 			_ke->accept();
 			break;
 
-		case Qt::Key_C:
-			if( _ke->modifiers() & Qt::ControlModifier )
-			{
-				copySelectedValues();
-				_ke->accept();
-			}
-			break;
-
-		case Qt::Key_X:
-			if( _ke->modifiers() & Qt::ControlModifier )
-			{
-				cutSelectedValues();
-				_ke->accept();
-			}
-			break;
-
-		case Qt::Key_V:
-			if( _ke->modifiers() & Qt::ControlModifier )
-			{
-				pasteValues();
-				_ke->accept();
-			}
-			break;
 		//TODO: m_selectButton and m_moveButton are broken.
 		/*case Qt::Key_A:
 			if( _ke->modifiers() & Qt::ControlModifier )
@@ -363,18 +340,6 @@ void AutomationEditor::keyPressEvent( QKeyEvent * _ke )
 			_ke->accept();
 			break;*/
 
-		case Qt::Key_Space:
-			if( Engine::getSong()->isPlaying() )
-			{
-				stop();
-			}
-			else
-			{
-				play();
-			}
-			_ke->accept();
-			break;
-
 		case Qt::Key_Home:
 			m_timeLine->pos().setTicks( 0 );
 			m_timeLine->updatePosition();
@@ -2171,6 +2136,10 @@ AutomationEditorWindow::AutomationEditorWindow() :
 		tr( "Click here and the values from the clipboard will be "
 			"pasted at the first visible measure." ) );
 
+	m_cutAction->setShortcut(Qt::CTRL | Qt::Key_X);
+	m_copyAction->setShortcut(Qt::CTRL | Qt::Key_C);
+	m_pasteAction->setShortcut(Qt::CTRL | Qt::Key_V);
+
 	connect(m_cutAction,   SIGNAL(triggered()), m_editor, SLOT(cutSelectedValues()));
 	connect(m_copyAction,  SIGNAL(triggered()), m_editor, SLOT(copySelectedValues()));
 	connect(m_pasteAction, SIGNAL(triggered()), m_editor, SLOT(pasteValues()));
@@ -2229,8 +2198,8 @@ AutomationEditorWindow::AutomationEditorWindow() :
 	m_toolBar->addSeparator();;
 	m_toolBar->addAction(m_drawAction);
 	m_toolBar->addAction(m_eraseAction);
-	//m_toolBar->addAction(m_selectButton);
-	//m_toolBar->addAction(m_moveButton);
+//	m_toolBar->addAction(m_selectButton);
+//	m_toolBar->addAction(m_moveButton);
 	m_toolBar->addSeparator();
 	m_toolBar->addAction(m_discreteAction);
 	m_toolBar->addAction(m_linearAction);
@@ -2239,9 +2208,10 @@ AutomationEditorWindow::AutomationEditorWindow() :
 	m_toolBar->addWidget( new QLabel( tr("Tension: "), m_toolBar ));
 	m_toolBar->addWidget( m_tensionKnob );
 	m_toolBar->addSeparator();
-	m_toolBar->addAction( m_cutAction );
-	m_toolBar->addAction( m_copyAction );
-	m_toolBar->addAction( m_pasteAction );
+//	Select is broken
+//	m_toolBar->addAction( m_cutAction );
+//	m_toolBar->addAction( m_copyAction );
+//	m_toolBar->addAction( m_pasteAction );
 	m_toolBar->addSeparator();
 	m_editor->m_timeLine->addToolButtons(m_toolBar);
 	m_toolBar->addSeparator();
diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
index e864bfd5d..d7838b5a9 100644
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -1032,30 +1032,6 @@ void PianoRoll::keyPressEvent( QKeyEvent* event )
 			event->accept();
 			break;
 
-		case Qt::Key_C:
-			if( event->modifiers() & Qt::ControlModifier )
-			{
-				event->accept();
-				copySelectedNotes();
-			}
-			break;
-
-		case Qt::Key_X:
-			if( event->modifiers() & Qt::ControlModifier )
-			{
-				event->accept();
-				cutSelectedNotes();
-			}
-			break;
-
-		case Qt::Key_V:
-			if( event->modifiers() & Qt::ControlModifier )
-			{
-				event->accept();
-				pasteNotes();
-			}
-			break;
-
 		case Qt::Key_A:
 			if( event->modifiers() & Qt::ControlModifier )
 			{
@@ -1070,18 +1046,6 @@ void PianoRoll::keyPressEvent( QKeyEvent* event )
 			event->accept();
 			break;
 
-		case Qt::Key_Space:
-			if( Engine::getSong()->isPlaying() )
-			{
-				stop();
-			}
-			else
-			{
-				play();
-			}
-			event->accept();
-			break;
-
 		case Qt::Key_Home:
 			m_timeLine->pos().setTicks( 0 );
 			m_timeLine->updatePosition();
@@ -4048,6 +4012,10 @@ PianoRollWindow::PianoRollWindow() :
 		tr( "Click here and the notes from the clipboard will be "
 			"pasted at the first visible measure." ) );
 
+	m_cutAction->setShortcut(Qt::CTRL | Qt::Key_X);
+	m_copyAction->setShortcut(Qt::CTRL | Qt::Key_C);
+	m_pasteAction->setShortcut(Qt::CTRL | Qt::Key_V);
+
 	connect(m_cutAction, SIGNAL(triggered()), m_editor, SLOT(cutSelectedNotes()));
 	connect(m_copyAction, SIGNAL(triggered()), m_editor, SLOT(copySelectedNotes()));
 	connect(m_pasteAction, SIGNAL(triggered()), m_editor, SLOT(pasteNotes()));