homogenize layer naming when adding via browser and add vector dialog

(fix #15510)
qgis · May 17, 2017 · c849bc8 · c849bc8
1 parent 14a8df4
commit c849bc8
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9311,6 +9311,17 @@ QgsVectorLayer* QgisApp::addVectorLayer( const QString& vectorLayerPath, const Q
     {
       // Register this layer with the layers registry
       QList<QgsMapLayer *> myList;
+
+      //set friendly name for datasources with only one layer
+      QStringList sublayers = layer->dataProvider()->subLayers();
+      QStringList elements = sublayers.at( 0 ).split( ':' );
+
+      Q_ASSERT( elements.size() >= 4 );
+      if ( layer->name() != elements.at( 1 ) )
+      {
+        layer->setName( QStringLiteral( "%1 %2 %3" ).arg( layer->name(), elements.at( 1 ), elements.at( 3 ) ) );
+      }
+
       myList << layer;
       QgsMapLayerRegistry::instance()->addMapLayers( myList );
       bool ok;