[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Alexander Bruy]

The following commit has been merged in the master branch:
commit 91da6af5acf4ea09218a495a1ea85dc0ccae267e
Author: Alexander Bruy <alexander.bruy at gmail.com>
Date:   Fri Mar 9 10:39:42 2012 +0200

    fix #5097

diff --git a/python/plugins/fTools/tools/doMergeShapes.py b/python/plugins/fTools/tools/doMergeShapes.py
index fe600e0..a5a3b52 100644
--- a/python/plugins/fTools/tools/doMergeShapes.py
+++ b/python/plugins/fTools/tools/doMergeShapes.py
@@ -30,9 +30,11 @@ class Dialog( QDialog, Ui_Dialog ):
     QObject.connect( self.leOutShape, SIGNAL( "editingFinished()" ), self.updateOutFile )
 
   def inputDir( self ):
+    settings = QSettings()
+    lastDir = settings.value( "/fTools/lastShapeDir", "." ).toString()
     inDir = QFileDialog.getExistingDirectory( self,
               self.tr( "Select directory with shapefiles to merge" ),
-              "." )
+              lastDir )
 
     if inDir.isEmpty():
       return
@@ -48,6 +50,8 @@ class Dialog( QDialog, Ui_Dialog ):
       self.inputFiles = None
       return
 
+    settings.setValue( "/fTools/lastShapeDir", inDir )
+
     self.progressFiles.setRange( 0, self.inputFiles.count() )
     self.leInputDir.setText( inDir )
 

-- 
The Quantum GIS in Debian project