Flushing my working-copy

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1151 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,3 +1,35 @@
+2008-06-16  Paul Giblock	<drfaygo/at/gmail/dot/com>
+
+	* plugins/stereo_matrix/stereo_matrix.cpp:
+	update author email address
+	
+	* src/gui/widgets/graph.cpp:
+	* src/gui/lfo_controller_dialog.cpp:
+	code cleanup
+
+	* src/gui/widgets/fade_button.cpp:
+	* src/tracks/instrument_track.cpp:
+	improve appearance of fade buttons
+
+	* include/tool_button.h:
+	* src/gui/widgets/tool_button.cpp:
+	* src/gui/lmms_style.cpp:
+	* data/themes/default/style.css:
+	remove styling, rely on QStyle and stylesheets now
+
+	* include/song_editor.h:
+	* include/main_window.h:
+	* include/timeline.h:
+	* src/gui/main_window.cpp:
+	* src/gui/song_editor.cpp:
+	* src/gui/widgets/nstate_button.cpp:
+	* src/core/timeline.cpp:
+
+	* data/themes/default/main_toolbar_bg.png:
+	* data/themes/default/toolbar_bg.png:
+	Enlarge images for resizable toolbars - quick fix. Could just clamp the
+	texture at the bottom
+	
 2008-06-15	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* include/knob.h:

plugins/stereo_matrix/stereo_matrix.cpp

@@ -39,7 +39,7 @@ plugin::descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor =
 	"Stereophonic Matrix",
 	QT_TRANSLATE_NOOP( "pluginBrowser",
 				"Plugin for freely manipulating stereo output" ),
-	"Paul Giblock <lherard/at/gmail.com>",
+	"Paul Giblock <drfaygo/at/gmail.com>",
 	0x0100,
 	plugin::Effect,
 	new pluginPixmapLoader( "logo" ),

src/gui/lfo_controller_dialog.cpp

@@ -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 );
 }
 

src/gui/widgets/fade_button.cpp

@@ -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 );
 }
 
 

src/gui/widgets/graph.cpp

@@ -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,

src/tracks/instrument_track.cpp

@@ -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();