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

Flushing my working-copy

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1151 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2008-06-16 06:05:39 +00:00
parent 805ded7a22
commit 842af2812d
6 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/lfo_controller_dialog.cpp
View File

@@ -210,28 +210,6 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent
m_lfoWaveBtnGrp->addButton( uwb );
/*
if( getEffect()->getControls()->getControlCount() > 0 )
{
QPushButton * ctls_btn = new QPushButton( tr( "Controls" ),
this );
QFont f = ctls_btn->font();
ctls_btn->setFont( pointSize<7>( f ) );
ctls_btn->setGeometry( 140, 14, 50, 20 );
connect( ctls_btn, SIGNAL( clicked() ),
this, SLOT( editControls() ) );
}
m_controlView = getEffect()->getControls()->createView();
m_subWindow = engine::getMainWindow()->workspace()->addSubWindow(
m_controlView );
connect( m_controlView, SIGNAL( closed() ),
this, SLOT( closeEffects() ) );
m_subWindow->hide();
*/
setModel( _model );
}

12
src/gui/widgets/fade_button.cpp
View File

@@ -98,10 +98,18 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
m_state -= 0.1f;
QTimer::singleShot( 20, this, SLOT( update() ) );
}
QPainter p( this );
p.fillRect( rect(), col );
p.setPen( QColor( 0, 0, 0 ) );
p.drawRect( 0, 0, rect().right(), rect().bottom() );
int w = rect().right();
int h = rect().bottom();
p.setPen( QColor( 37, 39, 46 ) );
p.drawLine( w, 1, w, h );
p.drawLine( 1, h, w, h );
p.setPen( QColor( 145, 147, 154 ) );
p.drawLine( 0, 0, 0, h-1 );
p.drawLine( 0, 0, w, 0 );
}

2
src/gui/widgets/graph.cpp
View File

@@ -244,7 +244,7 @@ void graph::paintEvent( QPaintEvent * )
);
}
// Draw last segment flat
// Draw last segment wrapped around
p.drawLine(2+static_cast<int>(length*xscale),
2+static_cast<int>( ( (*samps)[length] - maxVal ) * yscale ),
width()-2,

4
src/tracks/instrument_track.cpp
View File

@@ -894,8 +894,8 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it,
m_midiInputAction->setText( tr( "MIDI input" ) );
m_midiOutputAction->setText( tr( "MIDI output" ) );
m_tswActivityIndicator = new fadeButton( QColor( 96, 96, 96 ),
QColor( 0, 255, 0 ),
m_tswActivityIndicator = new fadeButton( QColor( 37, 57, 42 ),
QColor( 64, 255, 16 ),
getTrackSettingsWidget() );
m_tswActivityIndicator->setGeometry( 212, 2, 8, 28 );
m_tswActivityIndicator->show();