cleanups

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

Makefile.am

@@ -283,12 +283,14 @@ lmms_SOURCES =									\
 		$(srcdir)/src/gui/lfo_controller_dialog.cpp			\
 		$(srcdir)/src/gui/lmms_style.cpp				\
 		$(srcdir)/src/gui/main_window.cpp				\
+		$(srcdir)/src/gui/peak_controller_dialog.cpp			\
 		$(srcdir)/src/gui/piano_roll.cpp				\
 		$(srcdir)/src/gui/plugin_browser.cpp				\
 		$(srcdir)/src/gui/setup_dialog.cpp				\
 		$(srcdir)/src/gui/song_editor.cpp				\
 		$(srcdir)/src/gui/string_pair_drag.cpp				\
 		$(srcdir)/src/gui/track_container_view.cpp			\
+		$(srcdir)/src/gui/dialogs/export_project.ui			\
 		$(srcdir)/src/gui/widgets/automatable_button.cpp		\
 		$(srcdir)/src/gui/widgets/automatable_slider.cpp		\
 		$(srcdir)/src/gui/widgets/caption_menu.cpp			\
@@ -316,7 +318,6 @@ lmms_SOURCES =									\
 		$(srcdir)/src/gui/widgets/midi_port_menu.cpp			\
 		$(srcdir)/src/gui/widgets/name_label.cpp			\
 		$(srcdir)/src/gui/widgets/nstate_button.cpp			\
-		$(srcdir)/src/gui/peak_controller_dialog.cpp			\
 		$(srcdir)/src/gui/widgets/pixmap_button.cpp			\
 		$(srcdir)/src/gui/widgets/project_notes.cpp			\
 		$(srcdir)/src/gui/widgets/rubberband.cpp			\
@@ -392,7 +393,6 @@ lmms_SOURCES =									\
 		$(srcdir)/include/fader.h					\
 		$(srcdir)/include/mv_base.h					\
 		$(srcdir)/include/automatable_model.h				\
-		$(srcdir)/include/automatable_model_templates.h			\
 		$(srcdir)/include/graph.h					\
 		$(srcdir)/include/group_box.h					\
 		$(srcdir)/include/tab_widget.h					\
@@ -468,7 +468,6 @@ lmms_SOURCES =									\
 		$(srcdir)/include/base64.h					\
 		$(srcdir)/include/journalling_object.h				\
 		$(srcdir)/include/serializing_object.h				\
-		$(srcdir)/include/level_object.h				\
 		$(srcdir)/include/project_journal.h				\
 		$(srcdir)/include/shared_object.h				\
 		$(srcdir)/include/import_filter.h				\

src/core/plugin.cpp

@@ -38,8 +38,6 @@
 #include "dummy_plugin.h"
 
 
-//static embed::descriptor dummy_embed = { 0, NULL, "" } ;
-
 static plugin::descriptor dummy_plugin_descriptor =
 {
 	"dummy",
@@ -177,7 +175,7 @@ void plugin::getDescriptorsOfAvailPlugins( QVector<descriptor> & _plugin_descs )
 		{
 			printf( "LMMS-plugin %s does not have a "
 				"plugin-descriptor named %s!\n",
-					f.absoluteFilePath().toAscii().constData(),
+				f.absoluteFilePath().toAscii().constData(),
 					desc_name.toAscii().constData() );
 			continue;
 		}
@@ -188,6 +186,7 @@ void plugin::getDescriptorsOfAvailPlugins( QVector<descriptor> & _plugin_descs )
 
 
 
+
 pluginView * plugin::createView( QWidget * _parent )
 {
 	pluginView * pv = instantiateView( _parent );

src/core/track.cpp

@@ -1383,23 +1383,13 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) :
 	m_muteBtn->setCheckable( TRUE );
 	m_muteBtn->move( 46, 8 );
 	m_muteBtn->show();
-	m_muteBtn->setWhatsThis(
-		tr( "With this switch you can either mute this track or mute "
-			"all other tracks.\nBy clicking left, this track is "
-			"muted. This is useful, if you only want to listen to "
-			"the other tracks without changing this track "
-			"and loosing information.\nWhen you click right on "
-			"this switch, all other tracks will be "
-			"muted. This is useful, if you only want to listen to "
-			"this track." ) );
 	toolTip::add( m_muteBtn, tr( "Mute this track" ) );
 
-	m_soloBtn = new pixmapButton( this, tr( "Mute" ) );
+	m_soloBtn = new pixmapButton( this, tr( "Solo" ) );
 	m_soloBtn->setActiveGraphic( embed::getIconPixmap( "led_red" ) );
 	m_soloBtn->setInactiveGraphic( embed::getIconPixmap( "led_off" ) );
 	m_soloBtn->setCheckable( TRUE );
 	m_soloBtn->move( 62, 8 );
-	m_soloBtn->show();
 	toolTip::add( m_soloBtn, tr( "Solo" ) );
 
 	connect( this, SIGNAL( trackRemovalScheduled( trackView * ) ),