hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix opening automation patterns per context menu

Browse Source
This commit is contained in:
Lukas W
2015-01-12 22:45:28 +01:00
parent 854f1d1132
commit 30bc86e2e7
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/AutomationPatternView.h
View File

@@ -43,6 +43,8 @@ public:
virtual ~AutomationPatternView();
public slots:
/// Opens this view's pattern in the global automation editor
void openInAutomationEditor();
virtual void update();
@@ -56,7 +58,7 @@ protected slots:
protected:
virtual void constructContextMenu( QMenu * );
virtual void mouseDoubleClickEvent( QMouseEvent * _me );
virtual void mouseDoubleClickEvent(QMouseEvent * me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void resizeEvent( QResizeEvent * _re )
{

19
src/gui/AutomationPatternView.cpp
View File

@@ -73,6 +73,14 @@ AutomationPatternView::~AutomationPatternView()
void AutomationPatternView::openInAutomationEditor()
{
if(gui) gui->automationEditor()->open(m_pat);
}
void AutomationPatternView::update()
{
@@ -170,8 +178,7 @@ void AutomationPatternView::constructContextMenu( QMenu * _cm )
QAction * a = new QAction( embed::getIconPixmap( "automation" ),
tr( "Open in Automation editor" ), _cm );
_cm->insertAction( _cm->actions()[0], a );
connect( a, SIGNAL( triggered( bool ) ),
m_pat, SLOT( openInAutomationEditor() ) );
connect(a, SIGNAL(triggered()), this, SLOT(openInAutomationEditor()));
_cm->insertSeparator( _cm->actions()[1] );
_cm->addSeparator();
@@ -222,14 +229,14 @@ void AutomationPatternView::constructContextMenu( QMenu * _cm )
void AutomationPatternView::mouseDoubleClickEvent( QMouseEvent * _me )
void AutomationPatternView::mouseDoubleClickEvent( QMouseEvent * me )
{
if( _me->button() != Qt::LeftButton )
if(me->button() != Qt::LeftButton)
{
_me->ignore();
me->ignore();
return;
}
gui->automationEditor()->open(m_pat);
openInAutomationEditor();
}