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

* added submenu for removing connections

Browse Source 
* made automation-pattern rename working



git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1172 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-06-25 11:57:40 +00:00
parent 0d5f5473df
commit 939fd8ef44
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/automation_pattern.h
View File

@@ -66,7 +66,7 @@ public:
float valueAt( const midiTime & _time );
const QString name( void );
const QString name( void ) const;
// settings-management
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
@@ -138,6 +138,7 @@ public slots:
protected slots:
void resetName( void );
void changeName( void );
void disconnectObject( QAction * _a );
protected:

52
src/core/automation_pattern.cpp
View File

@@ -279,8 +279,12 @@ void automationPattern::loadSettings( const QDomElement & _this )
const QString automationPattern::name( void )
const QString automationPattern::name( void ) const
{
if( !trackContentObject::name().isEmpty() )
{
return( trackContentObject::name() );
}
if( !m_objects.isEmpty() )
{
return( m_objects.first()->fullDisplayName() );
@@ -475,7 +479,7 @@ void automationPatternView::update( void )
void automationPatternView::resetName( void )
{
//m_pat->setName( m_pat->m_autoTrack->name() );
m_pat->setName( QString::null );
}
@@ -486,12 +490,28 @@ void automationPatternView::changeName( void )
QString s = m_pat->name();
renameDialog rename_dlg( s );
rename_dlg.exec();
// m_pat->setName( s );
m_pat->setName( s );
update();
}
void automationPatternView::disconnectObject( QAction * _a )
{
journallingObject * j = engine::getProjectJournal()->
getJournallingObject( _a->data().toInt() );
if( j && dynamic_cast<automatableModel *>( j ) )
{
m_pat->m_objects.erase( qFind( m_pat->m_objects.begin(),
m_pat->m_objects.end(),
dynamic_cast<automatableModel *>( j ) ) );
update();
}
}
void automationPatternView::constructContextMenu( QMenu * _cm )
{
@@ -512,6 +532,27 @@ void automationPatternView::constructContextMenu( QMenu * _cm )
this, SLOT( resetName() ) );
_cm->addAction( embed::getIconPixmap( "rename" ), tr( "Change name" ),
this, SLOT( changeName() ) );
if( !m_pat->m_objects.isEmpty() )
{
_cm->addSeparator();
QMenu * m = new QMenu( tr( "Connections" ), _cm );
for( automationPattern::objectVector::iterator it =
m_pat->m_objects.begin();
it != m_pat->m_objects.end(); ++it )
{
if( *it )
{
a = new QAction( tr( "Disconnect \"%1\"" ).
arg( ( *it )->fullDisplayName() ), m );
a->setData( ( *it )->id() );
m->addAction( a );
}
}
connect( m, SIGNAL( triggered( QAction * ) ),
this, SLOT( disconnectObject( QAction * ) ) );
_cm->addMenu( m );
}
_cm->addSeparator();
}
@@ -611,10 +652,7 @@ void automationPatternView::paintEvent( QPaintEvent * )
p.setPen( QColor( 32, 240, 32 ) );
}
if( m_pat->name() != m_pat->m_autoTrack->name() )
{
p.drawText( 2, p.fontMetrics().height() - 1, m_pat->name() );
}
p.drawText( 2, p.fontMetrics().height() - 1, m_pat->name() );
if( m_pat->isMuted() )
{