removed publicName-properties in various classes and plugin-descriptor and use model::displayName instead

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

src/core/controller.cpp

@@ -45,8 +45,9 @@ QVector<controller *> controller::s_controllers;
 
 
 
-controller::controller( ControllerTypes _type, model * _parent ) :
-	model( _parent ),
+controller::controller( ControllerTypes _type, model * _parent,
+					const QString & _display_name ) :
+	model( _parent, _display_name ),
 	journallingObject(),
 	m_type( _type )
 {
@@ -149,7 +150,8 @@ controller * controller::create( ControllerTypes _ct, model * _parent )
 			if( dummy )
 				c = dummy;
 			else
-				c = new controller( DummyController, NULL );
+				c = new controller( DummyController, NULL,
+								QString() );
 			break;
 
 		case LfoController: 

src/core/lfo_controller.cpp

@@ -40,7 +40,7 @@
 const float TWO_PI = 6.28318531f;
 
 lfoController::lfoController( model * _parent ) :
-	controller( LfoController, _parent ),
+	controller( LfoController, _parent, tr( "LFO Controller" ) ),
 	m_baseModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Base value" ) ),
 	m_speedModel( 2.0, 0.01, 20.0, 0.0001, 20000.0, this, tr( "Oscillator speed" ) ),
 	m_amountModel( 1.0, -1.0, 1.0, 0.005, this, tr( "Oscillator amount" ) ),

src/core/midi/midi_controller.cpp

@@ -39,7 +39,7 @@
 
 
 midiController::midiController( model * _parent ) :
-	controller( MidiController, _parent ),
+	controller( MidiController, _parent, tr( "MIDI Controller" ) ),
 	midiEventProcessor(),
 	m_midiPort( tr( "unnamed_midi_controller" ),
 			engine::getMixer()->getMIDIClient(), this, this,

src/core/peak_controller.cpp

@@ -44,7 +44,7 @@ peakControllerEffectVector peakController::s_effects;
 
 peakController::peakController( model * _parent, 
 		peakControllerEffect * _peak_effect ) :
-	controller( PeakController, _parent ),
+	controller( PeakController, _parent, tr( "LFO Controller" ) ),
 	m_peakEffect( _peak_effect )
 {
 }

src/core/tool.cpp

@@ -77,7 +77,7 @@ toolView::toolView( tool * _tool ) :
 	engine::getMainWindow()->workspace()->addSubWindow( this );
 	parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE );
 
-	setWindowTitle( _tool->publicName() );
+	setWindowTitle( _tool->displayName() );
 	setWindowIcon( _tool->getDescriptor()->logo->pixmap() );
 }
 

src/gui/effect_control_dialog.cpp

@@ -39,7 +39,7 @@ effectControlDialog::effectControlDialog( effectControls * _controls ) :
 	modelView( _controls, this ),
 	m_effectControls( _controls )
 {
-	setWindowTitle( m_effectControls->getEffect()->publicName() );
+	setWindowTitle( m_effectControls->getEffect()->displayName() );
 
 }
 

src/gui/effect_select_dialog.cpp

@@ -175,7 +175,7 @@ effectListWidget::effectListWidget( QWidget * _parent ) :
 	for( effectKeyList::const_iterator it = m_effectKeys.begin();
 						it != m_effectKeys.end(); ++it )
 	{
-		plugin_names += QString( ( *it ).desc->publicName ) +
+		plugin_names += QString( ( *it ).desc->displayName ) +
 			( ( ( *it ).desc->sub_plugin_features != NULL ) ?
 							": " + ( *it ).name
 						:

src/gui/main_window.cpp

@@ -254,7 +254,7 @@ void mainWindow::finalize( void )
 		if( it->type == plugin::Tool )
 		{
 			m_toolsMenu->addAction( it->logo->pixmap(),
-							it->publicName );
+							it->displayName );
 			m_tools.push_back( tool::instantiate( it->name,
 					/*this*/NULL )->createView( this ) );
 		}

src/gui/plugin_browser.cpp

@@ -141,7 +141,8 @@ void pluginDescWidget::paintEvent( QPaintEvent * )
 	QFont f = pointSize<8>( p.font() );
 	f.setBold( TRUE );
 	p.setFont( f );
-	p.drawText( 10 + logo_size.width(), 15, m_pluginDescriptor.publicName );
+	p.drawText( 10 + logo_size.width(), 15,
+					m_pluginDescriptor.displayName );
 
 	if( height() > 24 || m_mouseOver )
 	{

src/gui/widgets/controller_view.cpp

@@ -145,9 +145,9 @@ void controllerView::paintEvent( QPaintEvent * )
 	controller * c = castModel<controller>();
 
 	p.setPen( QColor( 64, 64, 64 ) );
-	p.drawText( 7, 13, c->publicName() );
+	p.drawText( 7, 13, c->displayName() );
 	p.setPen( Qt::white );
-	p.drawText( 6, 12, c->publicName() );
+	p.drawText( 6, 12, c->displayName() );
 
     f.setBold( FALSE );
     p.setFont( f );

src/gui/widgets/effect_view.cpp

@@ -220,7 +220,7 @@ void effectView::closeEffects( void )
 void effectView::contextMenuEvent( QContextMenuEvent * )
 {
 	QPointer<captionMenu> contextMenu = new captionMenu(
-						getEffect()->publicName() );
+						getEffect()->displayName() );
 	contextMenu->addAction( embed::getIconPixmap( "arp_up_on" ),
 						tr( "Move &up" ),
 						this, SLOT( moveUp() ) );
@@ -252,9 +252,9 @@ void effectView::paintEvent( QPaintEvent * )
 	p.setFont( f );
 
 	p.setPen( QColor( 64, 64, 64 ) );
-	p.drawText( 6, 55, getEffect()->publicName() );
+	p.drawText( 6, 55, getEffect()->displayName() );
 	p.setPen( Qt::white );
-	p.drawText( 5, 54, getEffect()->publicName() );
+	p.drawText( 5, 54, getEffect()->displayName() );
 }
 
 

src/tracks/instrument_track.cpp

@@ -355,7 +355,7 @@ QString instrumentTrack::instrumentName( void ) const
 {
 	if( m_instrument != NULL )
 	{
-		return( m_instrument->publicName() );
+		return( m_instrument->displayName() );
 	}
 	return( QString::null );
 }