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

- integrated Toby's Qt4 fixes

Browse Source 
- connect the meter dialog only when custom sync
- don't set the modified flag on automated changes


git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@387 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-09-03 20:12:04 +00:00
parent d44cee241a
commit 7d8ff94277
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/widgets/tempo_sync_knob.cpp
View File

@@ -67,10 +67,6 @@ tempoSyncKnob::tempoSyncKnob( int _knob_num, QWidget * _parent,
this, SLOT( calculateTempoSyncTime( bpm_t ) ) );
m_custom = new meterDialog( eng()->getMainWindow()->workspace(),
_track );
connect( m_custom, SIGNAL( numeratorChanged( int ) ),
this, SLOT( updateCustom( int ) ) );
connect( m_custom, SIGNAL( denominatorChanged( int ) ),
this, SLOT( updateCustom( int ) ) );
m_custom->hide();
m_custom->setWindowTitle( "Meter" );
}
@@ -119,6 +115,7 @@ void tempoSyncKnob::contextMenuEvent( QContextMenuEvent * )
#ifdef QT4
QMenu * syncMenu = contextMenu.addMenu( m_tempoSyncIcon,
m_tempoSyncDescription );
#else
QMenu * syncMenu = new QMenu( this );
#endif
@@ -297,12 +294,7 @@ void tempoSyncKnob::setTempoSync( QAction * ) { }
void tempoSyncKnob::setTempoSync( int _note_type )
{
m_tempoSyncMode = ( tempoSyncMode ) _note_type;
if( m_tempoSyncMode != CUSTOM )
{
m_custom->hide();
}
calculateTempoSyncTime( eng()->getSongEditor()->getTempo() );
setSyncMode( ( tempoSyncMode ) _note_type );
eng()->getSongEditor()->setModified();
}
@@ -438,7 +430,23 @@ tempoSyncKnob::tempoSyncMode tempoSyncKnob::getSyncMode( void )
void tempoSyncKnob::setSyncMode( tempoSyncMode _new_mode )
{
m_tempoSyncMode = _new_mode;
if( m_tempoSyncMode != _new_mode )
{
m_tempoSyncMode = _new_mode;
if( _new_mode == CUSTOM )
{
connect( m_custom, SIGNAL( numeratorChanged( int ) ),
this, SLOT( updateCustom( int ) ) );
connect( m_custom, SIGNAL( denominatorChanged( int ) ),
this, SLOT( updateCustom( int ) ) );
}
else
{
m_custom->hide();
disconnect( m_custom, 0,
this, SLOT( updateCustom( int ) ) );
}
}
calculateTempoSyncTime( eng()->getSongEditor()->getTempo() );
}
@@ -499,7 +507,7 @@ void tempoSyncKnob::setSyncIcon( const QPixmap & _new_icon )
void tempoSyncKnob::updateCustom( int )
{
setTempoSync( CUSTOM );
setSyncMode( CUSTOM );
}