Make click on a unchecked layer in the tree view check all its parents.

rouault · rouault · commit 02b78a96f6e7 · 2017-01-03T12:47:35.000+01:00
This removes the Ctrl+clic requirement added initially.
diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -394,7 +394,11 @@ bool QgsLayerTreeModel::setData( const QModelIndex& index, const QVariant& value
       return false;
 
     bool checked = static_cast< Qt::CheckState >( value.toInt() ) == Qt::Checked;
-    if ( testFlag( ActionHierarchical ) )
+    if ( checked &&  node->children().isEmpty() )
+    {
+      node->setItemVisibilityCheckedParentRecursive( checked );
+    }
+    else if ( testFlag( ActionHierarchical ) )
     {
       if ( node->children().isEmpty() )
         node->setItemVisibilityCheckedParentRecursive( checked );
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -148,7 +148,7 @@ QAction* QgsLayerTreeViewDefaultActions::actionCheckAndAllParents( QObject* pare
   QgsLayerTreeNode* node = mView->currentNode();
   if ( !node || !QgsLayerTree::isLayer( node ) || node->isVisible() )
     return nullptr;
-  QAction* a = new QAction( tr( "Check and all its parents (Ctrl-click)" ), parent );
+  QAction* a = new QAction( tr( "Check and all its parents" ), parent );
   connect( a, &QAction::triggered, this, &QgsLayerTreeViewDefaultActions::checkAndAllParents );
   return a;
 }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ QAction* QgsLayerTreeViewDefaultActions::actionCheckAndAllParents( QObject* pare`
`148`	`148`	`QgsLayerTreeNode* node = mView->currentNode();`
`149`	`149`	`if ( !node \|\| !QgsLayerTree::isLayer( node ) \|\| node->isVisible() )`
`150`	`150`	`return nullptr;`
`151`		`- QAction* a = new QAction( tr( "Check and all its parents (Ctrl-click)" ), parent );`
	`151`	`+ QAction* a = new QAction( tr( "Check and all its parents" ), parent );`
`152`	`152`	`connect( a, &QAction::triggered, this, &QgsLayerTreeViewDefaultActions::checkAndAllParents );`
`153`	`153`	`return a;`
`154`	`154`	`}`