From 15efba29de748962383d7fb1dda8521706659f5d Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 19 May 2008 09:45:50 +0000 Subject: [PATCH] Some GUI cleanup git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@993 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 7 +++++++ src/core/track.cpp | 16 ++++++++++------ src/gui/lfo_controller_dialog.cpp | 3 --- src/gui/widgets/controller_view.cpp | 2 -- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83f5e598b..104e72270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,13 @@ * white_noise_shape_inactive.png: Updated Triple-oscillator artwork + * src/core/track.cpp: + Darkened the tracks so it doesn't hurt to look at + + * src/gui/lfo_controller_dialog.cpp: + * src/gui/widgets/controller_view.cpp: + Remove stray line + 2008-05-18 Paul Giblock * src/gui/widgets/knob.cpp: diff --git a/src/core/track.cpp b/src/core/track.cpp index 3e5b468b9..e1bc53709 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -876,18 +876,22 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe ) QPainter pmp( &backgrnd ); QLinearGradient grad( 0,0, 0,h ); - grad.setColorAt( 0, QColor( 96, 96, 96 ) ); - grad.setColorAt( 1, QColor( 192, 192, 192 ) ); + grad.setColorAt( 0.05, QColor( 64, 64, 64 ) ); + grad.setColorAt( 0.7, QColor( 128, 128, 128 ) ); + grad.setColorAt( 0.9, QColor( 160, 160, 160 ) ); + grad.setColorAt( 1.0, QColor( 64, 64, 64) ); pmp.fillRect( 0, 0, w, h, grad ); QLinearGradient grad2( 0,0, 0,h ); - grad2.setColorAt( 0, QColor( 64, 64, 64 ) ); - grad2.setColorAt( 1, QColor( 128, 128, 128 ) ); + grad2.setColorAt( 0.05, QColor( 48, 48, 48 ) ); + grad2.setColorAt( 0.7, QColor( 96, 96, 96 ) ); + grad2.setColorAt( 0.9, QColor( 120, 120, 120 ) ); + grad2.setColorAt( 1.0, QColor( 48, 48, 48 ) ); pmp.fillRect( w, 0, w , h, grad2 ); // draw vertical lines - pmp.setPen( QColor( 80, 84, 96 ) ); - for( int x = 0; x < w * 2; x += ppt ) + pmp.setPen( QPen( QColor( 80, 84, 96, 192 ), 1 ) ); + for( int x = 0; x <= w * 2; x += ppt ) { pmp.drawLine( x, 0, x, h ); } diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp index 0e56cc92a..2ba7bb580 100644 --- a/src/gui/lfo_controller_dialog.cpp +++ b/src/gui/lfo_controller_dialog.cpp @@ -261,9 +261,6 @@ void lfoControllerDialog::contextMenuEvent( QContextMenuEvent * ) void lfoControllerDialog::paintEvent( QPaintEvent * ) { QPainter p( this ); - - p.setPen( QColor( 128, 64, 0 ) ); - p.drawLine(0,0,40,40); } diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp index ed408e318..f870ad841 100644 --- a/src/gui/widgets/controller_view.cpp +++ b/src/gui/widgets/controller_view.cpp @@ -197,8 +197,6 @@ void controllerView::paintEvent( QPaintEvent * ) f.setBold( TRUE ); p.setFont( f ); - p.setPen( QColor( 64, 64, 64 ) ); - p.drawLine(0,0,20,20); p.drawText( 6, 55, castModel()->publicName() ); p.setPen( Qt::white ); p.drawText( 5, 54, castModel()->publicName() );