QgsAppLayerHandling::addSublayers(): avoid prefixing layer name with …

…basename if it starts with basename Adresses #51144 (comment)
qgis · Jan 3, 2023 · 0175806 · 0175806
1 parent a5f28d0
commit 0175806
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/app/layers/qgsapplayerhandling.cpp b/src/app/layers/qgsapplayerhandling.cpp
@@ -728,8 +728,11 @@ QList<QgsMapLayer *> QgsAppLayerHandling::addSublayers( const QList<QgsProviderS
     }
     else
     {
-      if ( layerName != baseName && !layerName.isEmpty() && !baseName.isEmpty() )
+      if ( layerName != baseName && !layerName.isEmpty() && !baseName.isEmpty() &&
+           !layerName.startsWith( baseName ) )
+      {
         layer->setName( QStringLiteral( "%1 — %2" ).arg( baseName, layerName ) );
+      }
       else if ( !layerName.isEmpty() )
         layer->setName( layerName );
       else if ( !baseName.isEmpty() )

diff --git a/src/gui/qgsprovidersublayersdialog.cpp b/src/gui/qgsprovidersublayersdialog.cpp
@@ -123,12 +123,7 @@ QgsProviderSublayersDialog::QgsProviderSublayersDialog( const QString &uri, cons
 
   if ( !fileName.isEmpty() )
   {
-    mGroupName = fileName;
-    const QgsSettings settings;
-    if ( settings.value( QStringLiteral( "qgis/formatLayerName" ), false ).toBool() )
-    {
-      mGroupName = QgsMapLayer::formatLayerName( mGroupName );
-    }
+    setGroupName( fileName );
   }
 
   setWindowTitle( fileName.isEmpty() ? tr( "Select Items to Add" ) : QStringLiteral( "%1 | %2" ).arg( tr( "Select Items to Add" ), fileName ) );