Merge pull request #8603 from chau-intl/release-3_4

luipir · web-flow · commit a7ab47dd1d8f · 2018-12-04T15:05:51.000+01:00
[backport] Hide newly added layer(s) when in group. Fixes #19174
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4934,6 +4934,7 @@ void QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )
 
     QgsLayerTreeGroup *group = nullptr;
     bool addToGroup = settings.value( QStringLiteral( "/qgis/openSublayersInGroup" ), true ).toBool();
+    bool newLayersVisible = settings.value( QStringLiteral( "/qgis/new_layers_visible" ), true ).toBool();
     if ( addToGroup )
     {
       group = QgsProject::instance()->layerTreeRoot()->insertGroup( 0, layer->name() );
@@ -4967,6 +4968,10 @@ void QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )
         }
       }
     }
+
+    // Respect if user don't want the new group of layers visible.
+    if ( addToGroup && ! newLayersVisible )
+      group->setItemVisibilityCheckedRecursive( newLayersVisible );
   }
 }
 
@@ -5131,6 +5136,7 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )
   {
     QgsSettings settings;
     bool addToGroup = settings.value( QStringLiteral( "/qgis/openSublayersInGroup" ), true ).toBool();
+    bool newLayersVisible = settings.value( QStringLiteral( "/qgis/new_layers_visible" ), true ).toBool();
     QgsLayerTreeGroup *group = nullptr;
     if ( addToGroup )
       group = QgsProject::instance()->layerTreeRoot()->insertGroup( 0, name );
@@ -5144,6 +5150,10 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )
       if ( addToGroup )
         group->addLayer( l );
     }
+
+    // Respect if user don't want the new group of layers visible.
+    if ( addToGroup && ! newLayersVisible )
+      group->setItemVisibilityCheckedRecursive( newLayersVisible );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4934,6 +4934,7 @@ void QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )`
`4934`	`4934`
`4935`	`4935`	`QgsLayerTreeGroup *group = nullptr;`
`4936`	`4936`	`bool addToGroup = settings.value( QStringLiteral( "/qgis/openSublayersInGroup" ), true ).toBool();`
	`4937`	`+ bool newLayersVisible = settings.value( QStringLiteral( "/qgis/new_layers_visible" ), true ).toBool();`
`4937`	`4938`	`if ( addToGroup )`
`4938`	`4939`	`{`
`4939`	`4940`	`group = QgsProject::instance()->layerTreeRoot()->insertGroup( 0, layer->name() );`
`@@ -4967,6 +4968,10 @@ void QgisApp::askUserForGDALSublayers( QgsRasterLayer *layer )`
`4967`	`4968`	`}`
`4968`	`4969`	`}`
`4969`	`4970`	`}`
	`4971`	`+`
	`4972`	`+ // Respect if user don't want the new group of layers visible.`
	`4973`	`+ if ( addToGroup && ! newLayersVisible )`
	`4974`	`+ group->setItemVisibilityCheckedRecursive( newLayersVisible );`
`4970`	`4975`	`}`
`4971`	`4976`	`}`
`4972`	`4977`
`@@ -5131,6 +5136,7 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )`
`5131`	`5136`	`{`
`5132`	`5137`	`QgsSettings settings;`
`5133`	`5138`	`bool addToGroup = settings.value( QStringLiteral( "/qgis/openSublayersInGroup" ), true ).toBool();`
	`5139`	`+ bool newLayersVisible = settings.value( QStringLiteral( "/qgis/new_layers_visible" ), true ).toBool();`
`5134`	`5140`	`QgsLayerTreeGroup *group = nullptr;`
`5135`	`5141`	`if ( addToGroup )`
`5136`	`5142`	`group = QgsProject::instance()->layerTreeRoot()->insertGroup( 0, name );`
`@@ -5144,6 +5150,10 @@ void QgisApp::askUserForOGRSublayers( QgsVectorLayer *layer )`
`5144`	`5150`	`if ( addToGroup )`
`5145`	`5151`	`group->addLayer( l );`
`5146`	`5152`	`}`
	`5153`	`+`
	`5154`	`+ // Respect if user don't want the new group of layers visible.`
	`5155`	`+ if ( addToGroup && ! newLayersVisible )`
	`5156`	`+ group->setItemVisibilityCheckedRecursive( newLayersVisible );`
`5147`	`5157`	`}`
`5148`	`5158`	`}`
`5149`	`5159`