made LADSPA-plugin-layouter work again after Qt4-port, other small code-fixes

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

src/core/ladspa_control.cpp

@@ -31,16 +31,16 @@
 ladspaControl::ladspaControl( model * _parent, port_desc_t * _port, 
 					track * _track, bool _link ) :
 	model( _parent ),
+	m_link( _link ),
 	m_port( _port ),
-        m_linkEnabledModel( FALSE, FALSE, TRUE, boolModel::defaultRelStep(),
+        m_linkEnabledModel( _link, FALSE, TRUE, boolModel::defaultRelStep(),
 								this ),
         m_toggledModel( FALSE, FALSE, TRUE, boolModel::defaultRelStep(),
 								this ),
         m_knobModel( 0, 0, 0, 1, this )
 {
-	if( _link )
+	if( m_link )
 	{
-		m_linkEnabledModel.setValue( FALSE );
 		m_linkEnabledModel.setTrack( _track );
 		connect( &m_linkEnabledModel, SIGNAL( dataChanged() ),
 					 this, SLOT( linkStateChanged() ) );

src/widgets/combobox.cpp

@@ -202,10 +202,10 @@ void comboBox::paintEvent( QPaintEvent * _pe )
 			tx += pm.width() + 2;
 		}
 		p.setPen( QColor( 64, 64, 64 ) );
-		p.drawText( tx+1, p.fontMetrics().height()-1,
+		p.drawText( tx+1, p.fontMetrics().height()-3,
 						model()->currentText() );
 		p.setPen( QColor( 224, 224, 224 ) );
-		p.drawText( tx, p.fontMetrics().height()-2,
+		p.drawText( tx, p.fontMetrics().height()-4,
 						model()->currentText() );
 	}
 }

src/widgets/knob.cpp

@@ -84,8 +84,6 @@ knob::knob( int _knob_num, QWidget * _parent, const QString & _name ) :
 	m_knobPixmap = new QPixmap( embed::getIconPixmap( QString( "knob0" +
 		QString::number( m_knobNum + 1 ) ).toAscii().constData() ) );
 
-	//setRange( 0.0f, 100.0f, 1.0f );
-
 	setFixedSize( m_knobPixmap->width(), m_knobPixmap->height() );
 	setTotalAngle( 270.0f );
 }
@@ -451,7 +449,7 @@ void knob::paintEvent( QPaintEvent * _me )
 
 	p.translate( -ur.x(), -ur.y() );
 	drawKnob( &p );
-	if( m_label != "" )
+	if( !m_label.isEmpty() )
 	{
 		p.setFont( pointSize<6>( p.font() ) );
 		p.setPen( QColor( 64, 64, 64 ) );

src/widgets/ladspa_control_view.cpp

@@ -40,6 +40,8 @@ ladspaControlView::ladspaControlView( QWidget * _parent,
 	m_ctl( _ctl )
 {
 	QHBoxLayout * layout = new QHBoxLayout( this );
+	layout->setMargin( 0 );
+	layout->setSpacing( 0 );
 
 	ledCheckBox * link = NULL;
 
@@ -62,13 +64,17 @@ ladspaControlView::ladspaControlView( QWidget * _parent,
 							QString::null,
 							ledCheckBox::GREEN );
 			toggle->setModel( m_ctl->getToggledModel() );
-			setFixedSize( toggle->width(), toggle->height() );
-			if( m_ctl->m_link )
+			layout->addWidget( toggle );
+			if( link != NULL )
 			{
-				layout->addWidget( toggle );
 				setFixedSize( link->width() + toggle->width(),
 							toggle->height() );
 			}
+			else
+			{
+				setFixedSize( toggle->width(),
+							toggle->height() );
+			}
 			break;
 		}
 
@@ -93,13 +99,16 @@ ladspaControlView::ladspaControlView( QWidget * _parent,
 		knb->setLabel( m_ctl->getPort()->name );
 		knb->setHintText( tr( "Value:" ) + " ", "" );
 		knb->setWhatsThis( tr( "Sorry, no help available." ) );
-		setFixedSize( knb->width(), knb->height() );
-		if( m_ctl->m_link )
+		layout->addWidget( knb );
+		if( link != NULL )
 		{
-			layout->addWidget( knb );
 			setFixedSize( link->width() + knb->width(),
 						knb->height() );
 		}
+		else
+		{
+			setFixedSize( knb->width(), knb->height() );
+		}
 	}
 }