From f8120cd2fe4805cae35e88c94a3d4b1dd4e98be1 Mon Sep 17 00:00:00 2001 From: Dave French Date: Fri, 23 Jan 2015 18:15:03 +0000 Subject: [PATCH] Tidy up and remove clearing 1416 --- src/gui/editors/AutomationEditor.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index 9cfb70b12..0c8033cb6 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -2223,6 +2223,7 @@ AutomationEditorWindow::AutomationEditorWindow() : setFocus(); setWindowIcon( embed::getIconPixmap( "automation" ) ); setAcceptDrops( true ); + m_toolBar->setAcceptDrops( true ); } @@ -2285,7 +2286,7 @@ const AutomationPattern* AutomationEditorWindow::currentPattern() return m_editor->currentPattern(); } -void AutomationEditorWindow::dropEvent(QDropEvent *_de) +void AutomationEditorWindow::dropEvent( QDropEvent *_de ) { QString type = StringPairDrag::decodeKey( _de ); QString val = StringPairDrag::decodeValue( _de ); @@ -2296,20 +2297,14 @@ void AutomationEditorWindow::dropEvent(QDropEvent *_de) journallingObject( val.toInt() ) ); if( mod != NULL ) { - if( m_editor->m_pattern->firstObject() ) - { - m_editor->m_pattern->objectDestroyed( m_editor->m_pattern->firstObject()->id() ); - } - m_editor->m_pattern->clear(); - m_editor->m_pattern->addObject( mod ); - setCurrentPattern( m_editor->m_pattern ); + m_editor->m_pattern->addObject( mod ); } } update(); } -void AutomationEditorWindow::dragEnterEvent(QDragEnterEvent *_dee) +void AutomationEditorWindow::dragEnterEvent( QDragEnterEvent *_dee ) { StringPairDrag::processDragEnterEvent( _dee, "automatable_model" ); }