feat: when nodes are filtered, change "Check all" action to "Change all visible"

ansgarbecker · ansgarbecker · commit d54e555f2dd5 · 2026-03-19T17:30:56.000+01:00
Refs #1983
diff --git a/source/tabletools.pas b/source/tabletools.pas
@@ -1088,7 +1088,7 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
   Node: PVirtualNode;
   Obj: PDBObject;
   rxdb, rxtable: TRegExpr;
-  NodeMatches: Boolean;
+  NodeMatches, SomeHidden: Boolean;
   Errors: TStringList;
 begin
   // Immediately apply database filter
@@ -1102,6 +1102,7 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
   rxtable.Expression := '('+StringReplace(editTableFilter.Text, ';', '|', [rfReplaceAll])+')';
 
   Errors := TStringList.Create;
+  SomeHidden := False;
 
   TreeObjects.BeginUpdate;
   Node := TreeObjects.GetFirst;
@@ -1135,6 +1136,8 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
       end;
     end;
     TreeObjects.IsVisible[Node] := NodeMatches;
+    if not NodeMatches then
+      SomeHidden := True;
 
     Node := TreeObjects.GetNextInitialized(Node);
   end;
@@ -1145,6 +1148,10 @@ procedure TfrmTableTools.editDatabaseTableFilterChange(Sender: TObject);
 
   editDatabaseFilter.RightButton.Visible := editDatabaseFilter.Text <> '';
   editTableFilter.RightButton.Visible := editTableFilter.Text <> '';
+  if SomeHidden then
+    menuCheckAll.Caption := _('Check all visible')
+  else
+    menuCheckAll.Caption := _('Check all');
   timerCalcSize.Enabled := False;
   timerCalcSize.Enabled := True;
 end;
@@ -2512,7 +2519,7 @@ procedure TfrmTableTools.CheckAllClick(Sender: TObject);
   DBNode, ObjNode: PVirtualNode;
   WantedType: TListNodeType;
   DBObj: PDBObject;
-  CheckNone: Boolean;
+  CheckNone, DoCheck: Boolean;
   InvertCheck: Boolean;
   CheckedNodes: Int64;
 begin
@@ -2530,25 +2537,29 @@ procedure TfrmTableTools.CheckAllClick(Sender: TObject);
   CheckedNodes := 0;
   while Assigned(ObjNode) do begin
     DBObj := TreeObjects.GetNodeData(ObjNode);
+
     if CheckNone then
-      TreeObjects.CheckState[ObjNode] := csUncheckedNormal
-    else if InvertCheck then begin
-      if ObjNode.CheckState in CheckedStates then
-        TreeObjects.CheckState[ObjNode] := csUncheckedNormal
-      else
-        TreeObjects.CheckState[ObjNode] := csCheckedNormal;
+      DoCheck := False
+    else if not TreeObjects.IsVisible[ObjNode] then
+      DoCheck := False
+    else if InvertCheck then
+      DoCheck := not (ObjNode.CheckState in CheckedStates)
+    else
+      DoCheck := (WantedType = lntNone) or (DBObj.NodeType = WantedType) or (DBObj.GroupType = WantedType);
+
+    if DoCheck then begin
+      TreeObjects.CheckState[ObjNode] := csCheckedNormal;
+      Inc(CheckedNodes);
     end
     else begin
-      if (WantedType = lntNone) or (DBObj.NodeType = WantedType) or (DBObj.GroupType = WantedType) then
-        TreeObjects.CheckState[ObjNode] := csCheckedNormal
-      else
-        TreeObjects.CheckState[ObjNode] := csUncheckedNormal;
+      TreeObjects.CheckState[ObjNode] := csUncheckedNormal;
     end;
-    if ObjNode.CheckState = csCheckedNormal then
-      Inc(CheckedNodes);
+
     TreeObjects.RepaintNode(ObjNode);
     ObjNode := TreeObjects.GetNextSibling(ObjNode);
   end;
+
+  // Update parent node's checkbox
   if CheckedNodes = 0 then
     TreeObjects.CheckState[DBNode] := csUncheckedNormal
   else if CheckedNodes = TreeObjects.ChildCount[DBNode] then
