paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-06 15:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unit-Dependencies: use icons in graph

Browse Source 
git-svn-id: trunk@60870 -
This commit is contained in:
martin 2019-04-07 19:51:39 +00:00
parent 7f5bb76b42
commit fb202384bf
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/unitdependencies.pas
View File

@ -232,6 +232,7 @@ type
fImgIndexProject: integer; fImgIndexProject: integer;
fImgIndexUnit: integer; fImgIndexUnit: integer;
fImgIndexPackage: integer; fImgIndexPackage: integer;
fImgIndexPackageRequired: integer;
fImgIndexDirectory: integer; fImgIndexDirectory: integer;
fImgIndexOverlayImplUses: integer; fImgIndexOverlayImplUses: integer;
fImgIndexOverlayIntfCycle: integer; fImgIndexOverlayIntfCycle: integer;
@ -548,7 +549,8 @@ begin
fImgIndexProject := IDEImages.LoadImage('item_project'); fImgIndexProject := IDEImages.LoadImage('item_project');
fImgIndexUnit := IDEImages.LoadImage('item_unit'); fImgIndexUnit := IDEImages.LoadImage('item_unit');
fImgIndexPackage := IDEImages.LoadImage('pkg_required'); fImgIndexPackage := IDEImages.LoadImage('item_package');
fImgIndexPackageRequired := IDEImages.LoadImage('pkg_required');
fImgIndexDirectory := IDEImages.LoadImage('pkg_files'); fImgIndexDirectory := IDEImages.LoadImage('pkg_files');
fImgIndexOverlayImplUses := IDEImages.LoadImage('pkg_core_overlay'); fImgIndexOverlayImplUses := IDEImages.LoadImage('pkg_core_overlay');
fImgIndexOverlayIntfCycle := IDEImages.LoadImage('ce_cycleinterface'); fImgIndexOverlayIntfCycle := IDEImages.LoadImage('ce_cycleinterface');
@ -1742,6 +1744,7 @@ begin
NodeStyle.GapBottom:=5; NodeStyle.GapBottom:=5;
Parent:=GroupsTabSheet; Parent:=GroupsTabSheet;
OnSelectionChanged:=@GroupsLvlGraphSelectionChanged; OnSelectionChanged:=@GroupsLvlGraphSelectionChanged;
Images:=IDEImages.Images_16;
end; end;
GroupsSplitter.Top:=GroupsLvlGraph.Height; GroupsSplitter.Top:=GroupsLvlGraph.Height;
@ -1756,6 +1759,7 @@ begin
Parent:=GroupsTabSheet; Parent:=GroupsTabSheet;
OnSelectionChanged:=@UnitsLvlGraphSelectionChanged; OnSelectionChanged:=@UnitsLvlGraphSelectionChanged;
OnMouseDown:=@UnitsLvlGraphMouseDown; OnMouseDown:=@UnitsLvlGraphMouseDown;
Images:=IDEImages.Images_16;
end; end;
end; end;
@ -1826,7 +1830,7 @@ var
i: Integer; i: Integer;
RequiredPkg: TIDEPackage; RequiredPkg: TIDEPackage;
GroupObj: TObject; GroupObj: TObject;
GraphGroup: TLvlGraphNode; GraphGroup, ReqNode: TLvlGraphNode;
UnitNode: TAVLTreeNode; UnitNode: TAVLTreeNode;
GrpUnit: TUDUnit; GrpUnit: TUDUnit;
UsedUnit: TUDUnit; UsedUnit: TUDUnit;
@ -1846,9 +1850,11 @@ begin
// project // project
GroupObj:=LazarusIDE.ActiveProject; GroupObj:=LazarusIDE.ActiveProject;
GraphGroup.Selected:=true; GraphGroup.Selected:=true;
GraphGroup.ImageIndex := fImgIndexProject;
end else begin end else begin
// package // package
GroupObj:=PackageEditingInterface.FindPackageWithName(Group.Name); GroupObj:=PackageEditingInterface.FindPackageWithName(Group.Name);
GraphGroup.ImageIndex := fImgIndexPackage;
end; end;
if GroupObj<>nil then begin if GroupObj<>nil then begin
// add lpk dependencies // add lpk dependencies
@ -1859,7 +1865,9 @@ begin
// add for each dependency an edge in the Graph // add for each dependency an edge in the Graph
for i:=0 to PkgList.Count-1 do begin for i:=0 to PkgList.Count-1 do begin
RequiredPkg:=TIDEPackage(PkgList[i]); RequiredPkg:=TIDEPackage(PkgList[i]);
Graph.GetEdge(GraphGroup,Graph.GetNode(RequiredPkg.Name,true),true); ReqNode:=Graph.GetNode(RequiredPkg.Name,true);
ReqNode.ImageIndex := fImgIndexPackage;
Graph.GetEdge(GraphGroup,ReqNode,true);
end; end;
end; end;
finally finally
@ -1951,6 +1959,7 @@ begin
GroupUnit:=TUDUnit(NewUnits.GetNodeData(AVLNode)^.Value); GroupUnit:=TUDUnit(NewUnits.GetNodeData(AVLNode)^.Value);
SourceGraphNode:=Graph.GetNode(UnitToCaption(GroupUnit),true); SourceGraphNode:=Graph.GetNode(UnitToCaption(GroupUnit),true);
SourceGraphNode.Data:=GroupUnit; SourceGraphNode.Data:=GroupUnit;
SourceGraphNode.ImageIndex := fImgIndexUnit;
if GroupUnit.UsesUnits<>nil then begin if GroupUnit.UsesUnits<>nil then begin
for i:=0 to GroupUnit.UsesUnits.Count-1 do begin for i:=0 to GroupUnit.UsesUnits.Count-1 do begin
CurUses:=TUDUses(GroupUnit.UsesUnits[i]); CurUses:=TUDUses(GroupUnit.UsesUnits[i]);
@ -1959,6 +1968,7 @@ begin
if not NewGroups.Contains(UsedUnit.Group.Name) then continue; if not NewGroups.Contains(UsedUnit.Group.Name) then continue;
TargetGraphNode:=Graph.GetNode(UnitToCaption(UsedUnit),true); TargetGraphNode:=Graph.GetNode(UnitToCaption(UsedUnit),true);
TargetGraphNode.Data:=UsedUnit; TargetGraphNode.Data:=UsedUnit;
TargetGraphNode.ImageIndex := fImgIndexUnit;
Graph.GetEdge(SourceGraphNode,TargetGraphNode,true); Graph.GetEdge(SourceGraphNode,TargetGraphNode,true);
end; end;
end; end;
@ -2173,7 +2183,7 @@ begin
if IsProjectGroup(Node.Group) then if IsProjectGroup(Node.Group) then
Result:=fImgIndexProject Result:=fImgIndexProject
else else
Result:=fImgIndexPackage; Result:=fImgIndexPackageRequired;
udnDirectory: Result:=fImgIndexDirectory; udnDirectory: Result:=fImgIndexDirectory;
//udnInterface: ; //udnInterface: ;
//udnImplementation: ; //udnImplementation: ;