Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Apr 14, 2012 · 7e318c5 · 7e318c5
2 parents aab9976 + 847650e
commit 7e318c5
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 44 deletions.
diff --git a/python/core/qgis.sip b/python/core/qgis.sip
@@ -103,12 +103,12 @@ public:
   /** Wkt string that represents a geographic coord sys
    * @note added in 1.8 to replace GEOWkt
   */
-  const  QString GEOWKT;
+  const QString GEOWKT;
   /** Wkt string that represents a geographic coord sys
   * @note deprecated in 1.8 due to violation of coding conventions (globals
   *  should be in all caps).
   */
-  const  QString GEOWkt /Deprecated/;
+  const QString GEOWkt /Deprecated/;
 
   /** PROJ4 string that represents a geographic coord sys */
   const QString GEOPROJ4;

diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
@@ -52,7 +52,8 @@ public:
                                             QString *errorMessage = 0,
 					    const QStringList &datasourceOptions = QStringList(),
 					    const QStringList &layerOptions = QStringList(),
-                                            bool skipAttributeCreation = FALSE // added in 1.7
+                                            bool skipAttributeCreation = FALSE, // added in 1.7
+					    QString *newFilename = 0
                                             );
 
     /** create shapefile and initialize it */
@@ -63,7 +64,8 @@ public:
                         const QgsCoordinateReferenceSystem* srs,
 			const QString& driverName = "ESRI Shapefile",
 			const QStringList &datasourceOptions = QStringList(),
-			const QStringList &layerOptions = QStringList() );
+			const QStringList &layerOptions = QStringList(),
+                        QString *newFilename = 0 );
 
     /**Returns map with format filter string as key and OGR format key as value*/
     static QMap< QString, QString> supportedFiltersAndFormats();

diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -937,7 +937,10 @@ void QgsLegend::addLayers( QList<QgsMapLayer *> theLayerList )
   {
     QgsMapLayer * myFirstLayer = theLayerList.at( 0 );
     if ( !mMapCanvas->mapRenderer()->hasCrsTransformEnabled() )
+    {
       mMapCanvas->mapRenderer()->setDestinationCrs( myFirstLayer->crs() );
+      mMapCanvas->mapRenderer()->setMapUnits( myFirstLayer->crs().mapUnits() );
+    }
     mMapCanvas->zoomToFullExtent();
     mMapCanvas->clearExtentHistory();
   }

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -648,7 +648,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
 #else
   //remove mActionTouch button
   delete mActionTouch;
-  mActionTouch=0;
+  mActionTouch = 0;
 #endif
 
   // update windows
@@ -765,7 +765,7 @@ bool QgisApp::event( QEvent * event )
     done = true;
   }
 #ifdef HAVE_TOUCH
-  else if (event->type() == QEvent::Gesture )
+  else if ( event->type() == QEvent::Gesture )
   {
     done = gestureEvent( static_cast<QGestureEvent*>( event ) );
   }
@@ -3631,20 +3631,22 @@ void QgisApp::saveAsVectorFileGeneral( bool saveOnlySelection )
 
     QgsVectorFileWriter::WriterError error;
     QString errorMessage;
+    QString newFilename;
     error = QgsVectorFileWriter::writeAsVectorFormat(
               vlayer, vectorFilename, encoding, &destCRS, format,
               saveOnlySelection,
               &errorMessage,
               datasourceOptions, dialog->layerOptions(),
-              dialog->skipAttributeCreation() );
+              dialog->skipAttributeCreation(),
+              &newFilename );
 
     QApplication::restoreOverrideCursor();
 
     if ( error == QgsVectorFileWriter::NoError )
     {
       if ( dialog->addToCanvas() )
       {
-        addVectorLayers( QStringList( vectorFilename ), encoding, "file" );
+        addVectorLayers( QStringList( newFilename ), encoding, "file" );
       }
       QMessageBox::information( 0, tr( "Saving done" ), tr( "Export to vector file has been completed" ) );
     }
@@ -4700,10 +4702,10 @@ void QgisApp::isInOverview()
 
 void QgisApp::removingLayers( QStringList theLayers )
 {
-  foreach (const QString &layerId, theLayers)
+  foreach( const QString &layerId, theLayers )
   {
     QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer*>(
-          QgsMapLayerRegistry::instance()->mapLayer( layerId ) );
+                               QgsMapLayerRegistry::instance()->mapLayer( layerId ) );
     if ( !vlayer || !vlayer->isEditable() )
       return;
 
@@ -6027,9 +6029,9 @@ void QgisApp::markDirty()
 //changed from layerWasAdded to layersWereAdded in 1.8
 void QgisApp::layersWereAdded( QList<QgsMapLayer *> theLayers )
 {
-  for (int i = 0; i < theLayers.size(); ++i)
+  for ( int i = 0; i < theLayers.size(); ++i )
   {
-    QgsMapLayer * layer = theLayers.at(i);
+    QgsMapLayer * layer = theLayers.at( i );
     QgsDataProvider *provider = 0;
 
     QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
@@ -7448,7 +7450,7 @@ QMenu* QgisApp::createPopupMenu()
 }
 
 #ifdef HAVE_TOUCH
-bool QgisApp::gestureEvent(QGestureEvent *event)
+bool QgisApp::gestureEvent( QGestureEvent *event )
 {
   if ( QGesture *tapAndHold = event->gesture( Qt::TapAndHoldGesture ) )
   {

diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -135,6 +135,15 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
     mBrowserView->setTextElideMode( Qt::ElideNone );
     mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
     mBrowserView->header()->setStretchLastSection( false );
+
+    // find root favourites item
+    for ( int i = 0; i < mModel->rowCount(); i++ )
+    {
+      QModelIndex index = mModel->index( i, 0 );
+      QgsDataItem* item = mModel->dataItem( index );
+      if ( item && item->type() == QgsDataItem::Favourites )
+        mBrowserView->expand( index );
+    }
   }
 
   QDockWidget::showEvent( e );

diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -35,33 +35,14 @@ void QgsBrowserModel::addRootItems()
   mRootItems << item;
 
   // add favourite directories
-  QSettings settings;
-  QStringList favDirs = settings.value( "/browser/favourites", QVariant() ).toStringList();
-  // if there are 5 or more items, create a "Favourites" Root item
-  // perhaps this should be the default?
-  if ( favDirs.count() >= 5 )
+  QgsFavouritesItem *favitem = new QgsFavouritesItem( NULL, tr( "Favourites" ) );
+  if ( favitem )
   {
-    QgsFavouritesItem *item = new QgsFavouritesItem( NULL, tr( "Favourites" ), "" );
-    if ( item )
-    {
-      connectItem( item );
-      mRootItems << item;
-    }
-  }
-  else
-  {
-    foreach( QString favDir, favDirs )
-    {
-      item = new QgsDirectoryItem( NULL, favDir, favDir );
-      if ( item )
-      {
-        item->setIcon( QgsFavouritesItem::iconFavourites() );
-        mRootItems << item;
-        connectItem( item );
-      }
-    }
+    connectItem( favitem );
+    mRootItems << favitem;
   }
 
+  // add drives
   foreach( QFileInfo drive, QDir::drives() )
   {
     QString path = drive.absolutePath();

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -642,7 +642,7 @@ QgsErrorItem::~QgsErrorItem()
 QgsFavouritesItem::QgsFavouritesItem( QgsDataItem* parent, QString name, QString path )
     : QgsDataCollectionItem( parent, name, path )
 {
-  mType = Collection; //favourites?
+  mType = Favourites;
   mIcon = iconFavourites();
 }
 

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -48,6 +48,7 @@ class CORE_EXPORT QgsDataItem : public QObject
       Directory,
       Layer,
       Error,
+      Favourites
     };
 
     QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path );
@@ -277,7 +278,7 @@ class CORE_EXPORT QgsFavouritesItem : public QgsDataCollectionItem
 {
     Q_OBJECT
   public:
-    QgsFavouritesItem( QgsDataItem* parent, QString name, QString path );
+    QgsFavouritesItem( QgsDataItem* parent, QString name, QString path = QString() );
     ~QgsFavouritesItem();
 
     QVector<QgsDataItem*> createChildren();

diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -59,7 +59,8 @@ QgsVectorFileWriter::QgsVectorFileWriter(
   const QgsCoordinateReferenceSystem* srs,
   const QString& driverName,
   const QStringList &datasourceOptions,
-  const QStringList &layerOptions
+  const QStringList &layerOptions,
+  QString *newFilename
 )
     : mDS( NULL )
     , mLayer( NULL )
@@ -387,6 +388,9 @@ QgsVectorFileWriter::QgsVectorFileWriter(
     // create geometry which will be used for import
     mGeom = createEmptyGeometry( mWkbType );
   }
+
+  if ( newFilename )
+    *newFilename = vectorFileName;
 }
 
 OGRGeometryH QgsVectorFileWriter::createEmptyGeometry( QGis::WkbType wkbType )
@@ -584,7 +588,8 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
     QString *errorMessage,
     const QStringList &datasourceOptions,
     const QStringList &layerOptions,
-    bool skipAttributeCreation )
+    bool skipAttributeCreation,
+    QString *newFilename )
 {
   const QgsCoordinateReferenceSystem* outputCRS;
   QgsCoordinateTransform* ct = 0;
@@ -607,7 +612,7 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
     outputCRS = &layer->crs();
   }
   QgsVectorFileWriter* writer =
-    new QgsVectorFileWriter( fileName, fileEncoding, skipAttributeCreation ? QgsFieldMap() : layer->pendingFields(), layer->wkbType(), outputCRS, driverName, datasourceOptions, layerOptions );
+    new QgsVectorFileWriter( fileName, fileEncoding, skipAttributeCreation ? QgsFieldMap() : layer->pendingFields(), layer->wkbType(), outputCRS, driverName, datasourceOptions, layerOptions, newFilename );
 
   // check whether file creation was successful
   WriterError err = writer->hasError();

diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
@@ -79,7 +79,8 @@ class CORE_EXPORT QgsVectorFileWriter
                                             QString *errorMessage = 0,
                                             const QStringList &datasourceOptions = QStringList(),  // added in 1.6
                                             const QStringList &layerOptions = QStringList(),  // added in 1.6
-                                            bool skipAttributeCreation = false // added in 1.6
+                                            bool skipAttributeCreation = false, // added in 1.6
+                                            QString *newFilename = 0 // added in 1.9
                                           );
 
     /** create shapefile and initialize it */
@@ -90,7 +91,8 @@ class CORE_EXPORT QgsVectorFileWriter
                          const QgsCoordinateReferenceSystem* srs,
                          const QString& driverName = "ESRI Shapefile",
                          const QStringList &datasourceOptions = QStringList(), // added in 1.6
-                         const QStringList &layerOptions = QStringList() // added in 1.6
+                         const QStringList &layerOptions = QStringList(), // added in 1.6
+                         QString *newFilename = 0 // added in 1.9
                        );
 
     /**Returns map with format filter string as key and OGR format key as value*/