From 6446a203405795e1a6c7d6571e5b084fb0227178 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <jasp00@terra.es>
Date: Mon, 10 Jul 2006 00:44:22 +0000
Subject: [PATCH] - upgraded combo box - use default template to create new
 projects

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@223 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 src/core/song_editor.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp
index 49e949064..b56ee799c 100644
--- a/src/core/song_editor.cpp
+++ b/src/core/song_editor.cpp
@@ -392,7 +392,7 @@ songEditor::songEditor( engine * _engine ) :
 	zoom_lbl->setPixmap( embed::getIconPixmap( "zoom" ) );
 
 	// setup zooming-stuff
-	m_zoomingComboBox = new comboBox( m_toolBar, eng() );
+	m_zoomingComboBox = new comboBox( m_toolBar, NULL, eng(), NULL );
 	m_zoomingComboBox->setFixedSize( 80, 22 );
 	m_zoomingComboBox->move( 580, 4 );
 	for( int i = 0; i < 7; ++i )
@@ -1427,6 +1427,22 @@ void songEditor::clearProject( void )
 // create new file
 void songEditor::createNewProject( void )
 {
+	QString default_template = configManager::inst()->userProjectsDir()
+						+ "templates/default.mpt";
+	if( QFile::exists( default_template ) )
+	{
+		createNewProjectFromTemplate( default_template );
+		return;
+	}
+
+	default_template = configManager::inst()->factoryProjectsDir()
+						+ "templates/default.mpt";
+	if( QFile::exists( default_template ) )
+	{
+		createNewProjectFromTemplate( default_template );
+		return;
+	}
+
 	clearProject();
 
 	eng()->getProjectJournal()->setJournalling( FALSE );