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

upgraded buttons and button groups

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@194 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2006-07-02 21:41:53 +00:00
parent 078817f252
commit f286c8bd2d
3 changed files with 97 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/arp_and_chords_tab_widget.cpp
View File

@@ -198,7 +198,8 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
QWidget( _instrument_track->tabWidgetParent() ),
journallingObject( _instrument_track->eng() )
{
m_chordsGroupBox = new groupBox( tr( "CHORDS" ), this, eng() );
m_chordsGroupBox = new groupBox( tr( "CHORDS" ), this, eng(),
_instrument_track );
m_chordsGroupBox->setGeometry( CHORDS_GROUPBOX_X, CHORDS_GROUPBOX_Y,
CHORDS_GROUPBOX_WIDTH,
CHORDS_GROUPBOX_HEIGHT );
@@ -237,7 +238,8 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
m_arpGroupBox = new groupBox( tr( "ARPEGGIO" ), this, eng() );
m_arpGroupBox = new groupBox( tr( "ARPEGGIO" ), this, eng(),
_instrument_track );
m_arpGroupBox->setGeometry( ARP_GROUPBOX_X, ARP_GROUPBOX_Y,
ARP_GROUPBOX_WIDTH,
ARP_GROUPBOX_HEIGHT );
@@ -329,7 +331,8 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
pixmapButton * arp_up_btn = new pixmapButton( m_arpGroupBox, eng() );
pixmapButton * arp_up_btn = new pixmapButton( m_arpGroupBox, NULL,
eng(), NULL );
arp_up_btn->move( 10, 74 );
arp_up_btn->setActiveGraphic( embed::getIconPixmap( "arp_up_on" ) );
arp_up_btn->setInactiveGraphic( embed::getIconPixmap( "arp_up_off" ) );
@@ -339,7 +342,8 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
toolTip::add( arp_up_btn, tr( "arpeggio direction = up" ) );
pixmapButton * arp_down_btn = new pixmapButton( m_arpGroupBox, eng() );
pixmapButton * arp_down_btn = new pixmapButton( m_arpGroupBox, NULL,
eng(), NULL );
arp_down_btn->move( 30, 74 );
arp_down_btn->setActiveGraphic( embed::getIconPixmap( "arp_down_on" ) );
arp_down_btn->setInactiveGraphic( embed::getIconPixmap(
@@ -351,7 +355,7 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
pixmapButton * arp_up_and_down_btn = new pixmapButton( m_arpGroupBox,
eng() );
NULL, eng(), NULL );
arp_up_and_down_btn->move( 50, 74 );
arp_up_and_down_btn->setActiveGraphic( embed::getIconPixmap(
"arp_up_and_down_on" ) );
@@ -364,8 +368,8 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
tr( "arpeggio direction = up and down" ) );
pixmapButton * arp_random_btn = new pixmapButton( m_arpGroupBox,
eng() );
pixmapButton * arp_random_btn = new pixmapButton( m_arpGroupBox, NULL,
eng(), NULL );
arp_random_btn->move( 70, 74 );
arp_random_btn->setActiveGraphic( embed::getIconPixmap(
"arp_random_on" ) );
@@ -376,7 +380,9 @@ arpAndChordsTabWidget::arpAndChordsTabWidget( instrumentTrack * _instrument_trac
#endif
toolTip::add( arp_random_btn, tr( "arpeggio direction = random" ) );
m_arpDirectionBtnGrp = new automatableButtonGroup( this, eng() );
m_arpDirectionBtnGrp = new automatableButtonGroup( this,
tr( "Arpeggio direction" ),
eng(), _instrument_track );
m_arpDirectionBtnGrp->addButton( arp_up_btn );
m_arpDirectionBtnGrp->addButton( arp_down_btn );
m_arpDirectionBtnGrp->addButton( arp_up_and_down_btn );
@@ -660,7 +666,7 @@ void arpAndChordsTabWidget::saveSettings( QDomDocument & _doc,
m_arpRangeKnob->saveSettings( _doc, _this, "arprange" );
m_arpTimeKnob->saveSettings( _doc, _this, "arptime" );
m_arpGateKnob->saveSettings( _doc, _this, "arpgate" );
_this.setAttribute( "arpdir", m_arpDirectionBtnGrp->value() + 1 );
m_arpDirectionBtnGrp->saveSettings( _doc, _this, "arpdir" );
_this.setAttribute( "arpsyncmode",
( int ) m_arpTimeKnob->getSyncMode() );
@@ -680,8 +686,15 @@ void arpAndChordsTabWidget::loadSettings( const QDomElement & _this )
m_arpRangeKnob->loadSettings( _this, "arprange" );
m_arpTimeKnob->loadSettings( _this, "arptime" );
m_arpGateKnob->loadSettings( _this, "arpgate" );
m_arpDirectionBtnGrp->setInitValue(
if( _this.hasAttribute( "arpdir" ) )
{
m_arpDirectionBtnGrp->setInitValue(
_this.attribute( "arpdir" ).toInt() - 1 );
}
else
{
m_arpDirectionBtnGrp->loadSettings( _this, "arpdir" );
}
m_arpTimeKnob->setSyncMode(
( tempoSyncKnob::tempoSyncMode ) _this.attribute(
"arpsyncmode" ).toInt() );

41
src/core/envelope_and_lfo_widget.cpp
View File

@@ -356,7 +356,8 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
SLOT( updateAfterKnobChange( float ) ) );
pixmapButton * sin_lfo_btn = new pixmapButton( this, eng() );
pixmapButton * sin_lfo_btn = new pixmapButton( this, NULL, eng(),
NULL );
sin_lfo_btn->move( LFO_SHAPES_X, LFO_SHAPES_Y );
sin_lfo_btn->setActiveGraphic( embed::getIconPixmap(
"sin_wave_active" ) );
@@ -370,7 +371,8 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
tr( "Click here if you want a sine-wave for current "
"oscillator." ) );
pixmapButton * triangle_lfo_btn = new pixmapButton( this, eng() );
pixmapButton * triangle_lfo_btn = new pixmapButton( this, NULL, eng(),
NULL );
triangle_lfo_btn->move( LFO_SHAPES_X+15, LFO_SHAPES_Y );
triangle_lfo_btn->setActiveGraphic( embed::getIconPixmap(
"triangle_wave_active" ) );
@@ -384,7 +386,8 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
tr( "Click here if you want a triangle-wave for current "
"oscillator." ) );
pixmapButton * saw_lfo_btn = new pixmapButton( this, eng() );
pixmapButton * saw_lfo_btn = new pixmapButton( this, NULL, eng(),
NULL );
saw_lfo_btn->move( LFO_SHAPES_X+30, LFO_SHAPES_Y );
saw_lfo_btn->setActiveGraphic( embed::getIconPixmap(
"saw_wave_active" ) );
@@ -398,7 +401,8 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
tr( "Click here if you want a saw-wave for current "
"oscillator." ) );
pixmapButton * sqr_lfo_btn = new pixmapButton( this, eng() );
pixmapButton * sqr_lfo_btn = new pixmapButton( this, NULL, eng(),
NULL );
sqr_lfo_btn->move( LFO_SHAPES_X+45, LFO_SHAPES_Y );
sqr_lfo_btn->setActiveGraphic( embed::getIconPixmap(
"square_wave_active" ) );
@@ -412,7 +416,7 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
tr( "Click here if you want a square-wave for current "
"oscillator." ) );
m_userLfoBtn = new pixmapButton( this, eng() );
m_userLfoBtn = new pixmapButton( this, NULL, eng(), NULL );
m_userLfoBtn->move( LFO_SHAPES_X+60, LFO_SHAPES_Y );
m_userLfoBtn->setActiveGraphic( embed::getIconPixmap(
"usr_wave_active" ) );
@@ -430,7 +434,9 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
connect( m_userLfoBtn, SIGNAL( toggled( bool ) ), this,
SLOT( lfoUserWaveCh( bool ) ) );
m_lfoWaveBtnGrp = new automatableButtonGroup( this, eng() );
m_lfoWaveBtnGrp = new automatableButtonGroup( this,
tr( "LFO wave shape" ),
eng(), _track );
m_lfoWaveBtnGrp->addButton( sin_lfo_btn );
m_lfoWaveBtnGrp->addButton( triangle_lfo_btn );
m_lfoWaveBtnGrp->addButton( saw_lfo_btn );
@@ -441,7 +447,8 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
connect( m_lfoWaveBtnGrp, SIGNAL( valueChanged( int ) ),
SLOT( lfoWaveCh( int ) ) );
m_x100Cb = new ledCheckBox( tr( "FREQ x 100" ), this, eng() );
m_x100Cb = new ledCheckBox( tr( "FREQ x 100" ), this,
tr( "Freq x 100" ), eng(), _track );
m_x100Cb->setFont( pointSize<6>( m_x100Cb->font() ) );
m_x100Cb->move( LFO_PREDELAY_KNOB_X, LFO_GRAPH_Y + 36 );
#ifdef QT4
@@ -457,7 +464,8 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
m_controlEnvAmountCb = new ledCheckBox( tr( "MODULATE ENV-AMOUNT" ),
this, eng() );
this, tr( "Modulate Env-Amount" ),
eng(), _track );
m_controlEnvAmountCb->move( LFO_PREDELAY_KNOB_X, LFO_GRAPH_Y + 54 );
m_controlEnvAmountCb->setFont( pointSize<6>(
m_controlEnvAmountCb->font() ) );
@@ -604,13 +612,13 @@ void envelopeAndLFOWidget::saveSettings( QDomDocument & _doc,
m_sustainKnob->saveSettings( _doc, _parent, "sus" );
m_releaseKnob->saveSettings( _doc, _parent, "rel" );
m_amountKnob->saveSettings( _doc, _parent, "amt" );
_parent.setAttribute( "lshp", m_lfoShape );
m_lfoWaveBtnGrp->saveSettings( _doc, _parent, "lshp" );
m_lfoPredelayKnob->saveSettings( _doc, _parent, "lpdel" );
m_lfoAttackKnob->saveSettings( _doc, _parent, "latt" );
m_lfoSpeedKnob->saveSettings( _doc, _parent, "lspd" );
m_lfoAmountKnob->saveSettings( _doc, _parent, "lamt" );
_parent.setAttribute( "x100", m_x100Cb->isChecked() );
_parent.setAttribute( "ctlenvamt", m_controlEnvAmountCb->isChecked() );
m_x100Cb->saveSettings( _doc, _parent, "x100" );
m_controlEnvAmountCb->saveSettings( _doc, _parent, "ctlenvamt" );
_parent.setAttribute( "lfosyncmode",
( int ) m_lfoSpeedKnob->getSyncMode() );
_parent.setAttribute( "userwavefile", m_userWave.audioFile() );
@@ -630,18 +638,13 @@ void envelopeAndLFOWidget::loadSettings( const QDomElement & _this )
m_sustainKnob->loadSettings( _this, "sus" );
m_releaseKnob->loadSettings( _this, "rel" );
m_amountKnob->loadSettings( _this, "amt" );
m_lfoShape = static_cast<lfoShapes>( _this.attribute(
"lshp" ).toInt() );
m_lfoWaveBtnGrp->setValue( m_lfoShape );
m_lfoWaveBtnGrp->loadSettings( _this, "lshp" );
m_lfoPredelayKnob->loadSettings( _this, "lpdel" );
m_lfoAttackKnob->loadSettings( _this, "latt" );
m_lfoSpeedKnob->loadSettings( _this, "lspd" );
m_lfoAmountKnob->loadSettings( _this, "lamt" );
m_x100Cb->setChecked( _this.attribute( "x100" ).toInt() );
m_controlEnvAmountCb->setChecked( _this.attribute(
"ctlenvamt" ).toInt() );
m_x100Cb->loadSettings( _this, "x100" );
m_controlEnvAmountCb->loadSettings( _this, "ctlenvamt" );
m_lfoSpeedKnob->setSyncMode(
( tempoSyncKnob::tempoSyncMode ) _this.attribute(
"lfosyncmode" ).toInt() );