include stylesheet changes

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

ChangeLog

@@ -39,6 +39,11 @@
 	* src/gui/widgets/controller_view.cpp:
 	Remove stray line
 
+	* plugins/kicker/kicker.cpp:
+	* plugins/kicker/kicker.h:
+	* data/themes/default/style.css:
+	Including stylesheet changes I forgot to commit, fixes knobs in 3xOsc
+
 2008-05-18  Paul Giblock	<drfaygo/at/gmail/dot/com>
 
 	* src/gui/widgets/knob.cpp:

plugins/kicker/kicker.cpp

@@ -194,32 +194,12 @@ class kickerKnob : public knob
 {
 public:
 	kickerKnob( QWidget * _parent, const QString & _name ) :
-			knob( 0, _parent, _name )
+			knob( knobStyled, _parent, _name )
 	{
 		setFixedSize( 37, 47 );
 	}
-
-	static const QPointF m_midPoint;
-
-protected:
-	virtual void paintEvent( QPaintEvent * _me )
-	{
-		QPainter p( this );
-		p.setRenderHint( QPainter::Antialiasing );
-
-		QLineF ln = calculateLine( m_midPoint, 11.2, 4 );
-		
-		QRadialGradient gradient(m_midPoint, 11);
-		gradient.setColorAt(0.33, QColor( 240, 147, 14 ) );
-		gradient.setColorAt(1, QColor( 30, 35, 37 ) );
-		//gradient.setColorAt(1, QColor( 68, 77, 82 ) );
-		
-		p.setPen( QPen( gradient, 3 ) );
-		p.drawLine( ln );
-	}
 };
 
-const QPointF kickerKnob::m_midPoint = QPointF( 18.5, 13.5 );
 
 
 
@@ -292,3 +272,5 @@ plugin * lmms_plugin_main( model *, void * _data )
 }
 
 
+#include "kicker.moc"
+

plugins/kicker/kicker.h

@@ -26,6 +26,7 @@
 #ifndef _KICKER_H
 #define _KICKER_H
 
+#include <QObject>
 #include "instrument.h"
 #include "instrument_view.h"
 #include "knob.h"
@@ -74,6 +75,7 @@ private:
 
 class kickerInstrumentView : public instrumentView
 {
+	Q_OBJECT
 public:
 	kickerInstrumentView( instrument * _instrument, QWidget * _parent );
 	virtual ~kickerInstrumentView();

plugins/triple_oscillator/triple_oscillator.cpp

@@ -212,12 +212,8 @@ void oscillatorObject::updatePhaseOffsetRight( void )
 }
 
 
-
-
-
-
-
  
+
 tripleOscillator::tripleOscillator( instrumentTrack * _instrument_track ) :
 	instrument( _instrument_track, &tripleoscillator_plugin_descriptor )
 {