Merge branch 'master' into rename

Conflicts:
	src/core/Song.cpp
	src/gui/LfoControllerDialog.cpp
	src/tracks/InstrumentTrack.cpp

src/gui/MainWindow.cpp

@@ -189,6 +189,7 @@ MainWindow::MainWindow() :
 	vbox->addWidget( w );
 	setCentralWidget( main_widget );
 
+	m_errors = new QList<QString>();
 
 	m_updateTimer.start( 1000 / 20, this );	// 20 fps
 
@@ -345,7 +346,7 @@ void MainWindow::finalize()
 
 	help_menu->addSeparator();
 	help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ),
-			      this, SLOT( aboutLMMS() ) );
+				  this, SLOT( aboutLMMS() ) );
 
 	// create tool-buttons
 	ToolButton * project_new = new ToolButton(
@@ -1159,4 +1160,40 @@ void MainWindow::autoSave()
 
 
 
+void MainWindow::collectErrors(const QList<QString>* errors )
+{
+	m_errors->append( *errors );
+}
 
+
+
+void MainWindow::collectError( const QString error )
+{
+	m_errors->append( error );
+}
+
+
+
+void MainWindow::clearErrors()
+{
+	m_errors->clear();
+}
+
+
+
+void MainWindow::showErrors( const QString message )
+{
+    if ( m_errors->length() != 0 )
+	{   QString* errors = new QString();
+		for ( int i = 0 ; i < m_errors->length() ; i++ )
+		{
+			errors->append( m_errors->value( i ) + "\n" );
+		}
+		errors->prepend( "\n\n" );
+		errors->prepend( message );
+		QMessageBox::warning( NULL,
+			"LMMS Error report",
+			*errors,
+			QMessageBox::Ok );
+	}
+}