[QGIS Commit] r9299 - trunk/qgis/src/app/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-09-11 08:44:47 -0400 (Thu, 11 Sep 2008)
New Revision: 9299

Modified:
   trunk/qgis/src/app/composer/qgscomposer.cpp
Log:
Fix for problems in composer image export dialog (ticket 1304)

Modified: trunk/qgis/src/app/composer/qgscomposer.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposer.cpp	2008-09-11 11:46:54 UTC (rev 9298)
+++ trunk/qgis/src/app/composer/qgscomposer.cpp	2008-09-11 12:44:47 UTC (rev 9299)
@@ -926,10 +926,8 @@
       myFilters
     )
   );
-  myQFileDialog->selectFile( file.fileName() );
 
-  // allow for selection of more than one file
-  myQFileDialog->setFileMode( QFileDialog::AnyFile );
+  myQFileDialog->setFileMode(QFileDialog::AnyFile);
 
   // set the filter to the last one used
   myQFileDialog->selectFilter( myLastUsedFilter );
@@ -948,7 +946,8 @@
     return;
   }
 
-  myOutputFileNameQString = myQFileDialog->selectedFiles().first();
+  myOutputFileNameQString = myQFileDialog->selectedFiles().last();
+  qWarning(myOutputFileNameQString.toLocal8Bit().data());
   QString myFilterString = myQFileDialog->selectedFilter();
   QgsDebugMsg( QString( "Selected filter: %1" ).arg( myFilterString ) );
   QgsDebugMsg( QString( "Image type: %1" ).arg( myFilterMap[myFilterString] ) );