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

b&b editor: always add and remove so many steps as there are in one bar

Browse Source
This commit is contained in:
Hannu Haahti
2014-01-17 15:20:01 +02:00
parent f2590c24df
commit 19dc1aa913
2 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/pattern.h
View File

@@ -125,9 +125,6 @@ public:
bool empty();
void addSteps( int _n );
void removeSteps( int _n );
virtual trackContentObjectView * createView( trackView * _tv );
@@ -140,6 +137,8 @@ protected:
protected slots:
void addSteps();
void removeSteps();
void clear();
void freeze();
void unfreeze();
@@ -187,9 +186,6 @@ protected slots:
void resetName();
void changeName();
void addSteps( QAction * _item );
void removeSteps( QAction * _item );
protected:
virtual void constructContextMenu( QMenu * );

46
src/tracks/pattern.cpp
View File

@@ -485,9 +485,9 @@ void pattern::abortFreeze()
void pattern::addSteps( int _n )
void pattern::addSteps()
{
m_steps += _n;
m_steps += midiTime::stepsPerTact();
ensureBeatNotes();
emit dataChanged();
}
@@ -495,8 +495,9 @@ void pattern::addSteps( int _n )
void pattern::removeSteps( int _n )
void pattern::removeSteps()
{
int _n = midiTime::stepsPerTact();
if( _n < m_steps )
{
for( int i = m_steps - _n; i < m_steps; ++i )
@@ -908,23 +909,6 @@ void patternView::changeName()
void patternView::addSteps( QAction * _item )
{
m_pat->addSteps( _item->text().section( ' ', 0, 0 ).toInt() );
}
void patternView::removeSteps( QAction * _item )
{
m_pat->removeSteps( _item->text().section( ' ', 0, 0 ).toInt() );
}
void patternView::constructContextMenu( QMenu * _cm )
{
QAction * a = new QAction( embed::getIconPixmap( "piano" ),
@@ -967,24 +951,10 @@ void patternView::constructContextMenu( QMenu * _cm )
_cm->addSeparator();
}
QMenu * add_step_menu = _cm->addMenu(
embed::getIconPixmap( "step_btn_add" ),
tr( "Add steps" ) );
QMenu * remove_step_menu = _cm->addMenu(
embed::getIconPixmap( "step_btn_remove" ),
tr( "Remove steps" ) );
connect( add_step_menu, SIGNAL( triggered( QAction * ) ),
this, SLOT( addSteps( QAction * ) ) );
connect( remove_step_menu, SIGNAL( triggered( QAction * ) ),
this, SLOT( removeSteps( QAction * ) ) );
for( int i = 1; i <= 16; i *= 2 )
{
const QString label = ( i == 1 ) ?
tr( "1 step" ) :
tr( "%1 steps" ).arg( i );
add_step_menu->addAction( label );
remove_step_menu->addAction( label );
}
_cm->addAction( embed::getIconPixmap( "step_btn_add" ),
tr( "Add steps" ), m_pat, SLOT( addSteps() ) );
_cm->addAction( embed::getIconPixmap( "step_btn_remove" ),
tr( "Remove steps" ), m_pat, SLOT( removeSteps() ) );
}