From 8421d4404c21d55e79a9330893925198e1c7ed9a Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Sat, 28 Jun 2008 13:54:13 +0000
Subject: [PATCH] * confirm overwrite when exporting file * set filter when
 selecting output-file for export

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1187 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                     |  5 +++++
 src/core/project_renderer.cpp |  4 ++--
 src/core/song.cpp             | 33 +++++++++------------------------
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3018b2317..49355a0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/core/song.cpp:
+	* src/core/project_renderer.cpp:
+	- confirm overwrite when exporting file
+	- set filter when selecting output-file for export
+
 	* include/audio_file_device.h:
 	* include/audio_file_ogg.h:
 	* include/audio_file_wave.h:
diff --git a/src/core/project_renderer.cpp b/src/core/project_renderer.cpp
index 6b2cfa02d..60c9621db 100644
--- a/src/core/project_renderer.cpp
+++ b/src/core/project_renderer.cpp
@@ -37,10 +37,10 @@ fileEncodeDevice __fileEncodeDevices[] =
 {
 
 	{ projectRenderer::WaveFile,
-		QT_TRANSLATE_NOOP( "projectRenderer", "WAV-File" ),
+		QT_TRANSLATE_NOOP( "projectRenderer", "WAV-File (*.wav)" ),
 					".wav", &audioFileWave::getInst },
 	{ projectRenderer::OggFile,
-		QT_TRANSLATE_NOOP( "projectRenderer", "Compressed OGG-File" ),
+		QT_TRANSLATE_NOOP( "projectRenderer", "Compressed OGG-File (*.ogg)" ),
 					".ogg",
 #ifdef LMMS_HAVE_VORBIS_CODEC_H
 					&audioFileOgg::getInst
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 2ef0d21f4..ed3ab26f6 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -56,6 +56,7 @@
 #include "piano_roll.h"
 #include "project_journal.h"
 #include "project_notes.h"
+#include "project_renderer.h"
 #include "rename_dialog.h"
 #include "song_editor.h"
 #include "templates.h"
@@ -1065,43 +1066,27 @@ void song::exportProject( void )
 	{
 		base_filename = tr( "untitled" );
 	}
- 	base_filename += ".wav";//fileEncodeDevices[0].m_extension;
+ 	base_filename += __fileEncodeDevices[0].m_extension;
 
 	QFileDialog efd( engine::getMainWindow() );
 	efd.setFileMode( QFileDialog::AnyFile );
-
-/*	int idx = 0;
+	efd.setAcceptMode( QFileDialog::AcceptSave );
+	int idx = 0;
 	QStringList types;
-	while( fileEncodeDevices[idx].m_fileType != NullFile )
+	while( __fileEncodeDevices[idx].m_fileFormat !=
+					projectRenderer::NumFileFormats )
 	{
-		types << tr( fileEncodeDevices[idx].m_description );
+		types << tr( __fileEncodeDevices[idx].m_description );
 		++idx;
 	}
-	efd.setFilters( types );*/
+	efd.setFilters( types );
 	efd.selectFile( base_filename );
 	efd.setWindowTitle( tr( "Select file for project-export..." ) );
 
 	if( efd.exec() == QDialog::Accepted &&
-		!efd.selectedFiles().isEmpty() && efd.selectedFiles()[0] != ""
-		)
+		!efd.selectedFiles().isEmpty() && efd.selectedFiles()[0] != "" )
 	{
 		const QString export_file_name = efd.selectedFiles()[0];
-/*		if( QFileInfo( export_file_name ).exists() == TRUE &&
-			QMessageBox::warning( engine::getMainWindow(),
-						tr( "File already exists" ),
-						tr( "The file \"%1\" already "
-							"exists. Do you want "
-							"to overwrite it?"
-						).arg( QFileInfo(
-						export_file_name ).fileName() ),
-						QMessageBox::Yes,
-							QMessageBox::No |
-							QMessageBox::Escape |
-							QMessageBox::Default )
-			== QMessageBox::No )
-		{
-			return;
-		}*/
 		exportProjectDialog epd( export_file_name,
 						engine::getMainWindow() );
 		epd.exec();