[QGIS Commit] r13850 - trunk/qgis/src/app/ogr

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-06-30 07:06:24 +0000 (Wed, 30 Jun 2010)
New Revision: 13850

Modified:
   trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp
Log:
Fix initialisation of format combo box (mainly important for kml layers)

Modified: trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp
===================================================================
--- trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp	2010-06-30 06:25:52 UTC (rev 13849)
+++ trunk/qgis/src/app/ogr/qgsvectorlayersaveasdialog.cpp	2010-06-30 07:06:24 UTC (rev 13850)
@@ -33,6 +33,7 @@
 
   QSettings settings;
   QMap<QString, QString> map = QgsVectorFileWriter::ogrDriverList();
+  mFormatComboBox->blockSignals( true );
   for ( QMap< QString, QString>::const_iterator it = map.constBegin(); it != map.constEnd(); ++it )
   {
     mFormatComboBox->addItem( it.key(), it.value() );
@@ -40,8 +41,8 @@
 
   QString format = settings.value( "/UI/lastVectorFormat", "ESRI Shapefile" ).toString();
   mFormatComboBox->setCurrentIndex( mFormatComboBox->findData( format ) );
+  mFormatComboBox->blockSignals( false );
 
-
   mEncodingComboBox->addItems( QgsVectorDataProvider::availableEncodings() );
 
   QString enc = settings.value( "/UI/encoding", QString( "System" ) ).toString();
@@ -55,6 +56,7 @@
   mEncodingComboBox->setCurrentIndex( idx );
 
   leCRS->setText( tr( "Original CRS" ) );
+  on_mFormatComboBox_currentIndexChanged( mFormatComboBox->currentIndex() );
 }
 
 QgsVectorLayerSaveAsDialog::~QgsVectorLayerSaveAsDialog()