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

Merge pull request #654 from grejppi/master-songeditor

Browse Source 
SongEditor: change middle click to shift+right click, fix #621
This commit is contained in:
Tobias Doerffel
2014-04-28 21:28:21 +02:00
parent bdec1023e4 885b52cfa8
commit f02570b261
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/track.cpp
View File

@@ -532,11 +532,6 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me )
}
return;
}
else if( _me->modifiers() & Qt::ShiftModifier )
{
// add/remove object to/from selection
selectableObject::mousePressEvent( _me );
}
else if( _me->button() == Qt::LeftButton &&
_me->modifiers() & Qt::ControlModifier )
{
@@ -593,6 +588,17 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me )
mouseMoveEvent( _me );
s_textFloat->show();
}
else if( _me->button() == Qt::RightButton )
{
if( _me->modifiers() & Qt::ControlModifier )
{
m_tco->toggleMute();
}
else if( _me->modifiers() & Qt::ShiftModifier && fixedTCOs() == false )
{
remove();
}
}
else if( _me->button() == Qt::MidButton )
{
if( _me->modifiers() & Qt::ControlModifier )
@@ -771,6 +777,11 @@ void trackContentObjectView::mouseReleaseEvent( QMouseEvent * _me )
*/
void trackContentObjectView::contextMenuEvent( QContextMenuEvent * _cme )
{
if( _cme->modifiers() )
{
return;
}
QMenu contextMenu( this );
if( fixedTCOs() == false )
{

5
src/tracks/SampleTrack.cpp
View File

@@ -231,6 +231,11 @@ void SampleTCOView::updateSample()
void SampleTCOView::contextMenuEvent( QContextMenuEvent * _cme )
{
if( _cme->modifiers() )
{
return;
}
QMenu contextMenu( this );
if( fixedTCOs() == false )
{