paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-08 11:36:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

project groups: removed tree nodes: removed files+dependencies

Browse Source 
git-svn-id: trunk@50386 -
This commit is contained in:
mattias 2015-11-18 11:29:07 +00:00
parent 95a246bac1
commit 14a6e55da8
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
components/projectgroups/projectgroupeditor.pas
View File

@ -27,12 +27,13 @@ type
ntRemovedTarget, ntRemovedTarget,
ntFiles, ntFiles,
ntFile, ntFile,
ntRemovedFiles, //ntRemovedFiles,
ntRemovedFile, //ntRemovedFile,
ntDependencies, ntDependencies,
ntDependency, ntDependency
ntRemovedDependencies, //ntRemovedDependencies,
ntRemovedDependency); //ntRemovedDependency
);
TNodeData = class(TObject) TNodeData = class(TObject)
NodeType: TNodeType; NodeType: TNodeType;
@ -196,12 +197,12 @@ var
NIRemovedTargetProjectGroup: integer = 5; NIRemovedTargetProjectGroup: integer = 5;
NIFiles : integer = 16; NIFiles : integer = 16;
NIFile : integer = 17; NIFile : integer = 17;
NIRemovedFiles : integer = 18; //NIRemovedFiles : integer = 18;
NIRemovedFile : integer = 17; //NIRemovedFile : integer = 17;
NIDependencies : integer = 1; NIDependencies : integer = 1;
NIDependency : integer = 1; NIDependency : integer = 1;
NIRemovedDependencies : integer = 2; //NIRemovedDependencies : integer = 2;
NIRemovedDependency : integer = 2; //NIRemovedDependency : integer = 2;
// Node state image index // Node state image index
NSIActive : Integer = 20; // State index for active. NSIActive : Integer = 20; // State index for active.
@ -357,9 +358,6 @@ begin
exit; exit;
I:=T.ProjectGroup.IndexOfTarget(T.Target); I:=T.ProjectGroup.IndexOfTarget(T.Target);
J:=I-1; J:=I-1;
// Find previous not removed target
While (J>=0) and (T.ProjectGroup.Targets[J].Removed) do
Dec(J);
if J>=0 then if J>=0 then
T.ProjectGroup.ExchangeTargets(I,J); T.ProjectGroup.ExchangeTargets(I,J);
end; end;
@ -374,13 +372,10 @@ begin
T:=SelectedNodeData; T:=SelectedNodeData;
B:=Assigned(T) and (T.NodeType=ntTarget) and Assigned(T.Target); B:=Assigned(T) and (T.NodeType=ntTarget) and Assigned(T.Target);
If B then If B then
begin begin
I:=T.ProjectGroup.IndexOfTarget(T.Target)-1; I:=T.ProjectGroup.IndexOfTarget(T.Target)-1;
// Find previous not removed target
While (I>=0) and (T.ProjectGroup.Targets[i].Removed) do
Dec(I);
B:=(I>=0) B:=(I>=0)
end; end;
(Sender as TAction).Enabled:=B; (Sender as TAction).Enabled:=B;
UpdateIDEMenuCommandFromAction(Sender,cmdTargetEarlier); UpdateIDEMenuCommandFromAction(Sender,cmdTargetEarlier);
end; end;
@ -395,9 +390,6 @@ begin
exit; exit;
I:=T.ProjectGroup.IndexOfTarget(T.Target); I:=T.ProjectGroup.IndexOfTarget(T.Target);
J:=I+1; J:=I+1;
// Find next not removed target
While (J<T.ProjectGroup.TargetCount) and (T.ProjectGroup.Targets[J].Removed) do
Inc(J);
if (J<T.ProjectGroup.TargetCount) then if (J<T.ProjectGroup.TargetCount) then
T.ProjectGroup.ExchangeTargets(I,J); T.ProjectGroup.ExchangeTargets(I,J);
end; end;
@ -413,9 +405,6 @@ begin
if B then if B then
begin begin
I:=T.ProjectGroup.IndexOfTarget(T.Target)+1; I:=T.ProjectGroup.IndexOfTarget(T.Target)+1;
// Find next not removed target
While (I<T.ProjectGroup.TargetCount) and (T.ProjectGroup.Targets[i].Removed) do
Inc(I);
B:=(I<T.ProjectGroup.TargetCount); B:=(I<T.ProjectGroup.TargetCount);
end; end;
(Sender as TAction).Enabled:=B; (Sender as TAction).Enabled:=B;
@ -786,12 +775,12 @@ begin
end; end;
ntFiles: Result:=NIFiles; ntFiles: Result:=NIFiles;
ntFile: Result:=NIFile; ntFile: Result:=NIFile;
ntRemovedFiles: Result:=NIRemovedFiles; //ntRemovedFiles: Result:=NIRemovedFiles;
ntRemovedFile: Result:=NIRemovedFile; //ntRemovedFile: Result:=NIRemovedFile;
ntDependencies: Result:=NIDependencies; ntDependencies: Result:=NIDependencies;
ntDependency: Result:=NIDependency; ntDependency: Result:=NIDependency;
ntRemovedDependencies: Result:=NIRemovedDependencies; //ntRemovedDependencies: Result:=NIRemovedDependencies;
ntRemovedDependency: Result:=NIRemovedDependency; //ntRemovedDependency: Result:=NIRemovedDependency;
else else
Result:=-1; Result:=-1;
end; end;
@ -895,7 +884,7 @@ begin
//debugln(['TProjectGroupEditorForm.DisplayFileName PGBaseDir="',PGBaseDir,'" File="',AFileName,'" "',Result,'"']); //debugln(['TProjectGroupEditorForm.DisplayFileName PGBaseDir="',PGBaseDir,'" File="',AFileName,'" "',Result,'"']);
end else end else
Result:=AFileName; Result:=AFileName;
if not (NodeType in [ntFile, ntRemovedFile]) then if NodeType<>ntFile then
Result:=ChangeFileExt(Result,''); Result:=ChangeFileExt(Result,'');
end; end;
@ -1031,7 +1020,7 @@ Var
PkgName: String; PkgName: String;
begin begin
PD[False]:=CreateNode(AParent,lisNodeDependencies,ntDependencies,Nil,AProjectGroup); PD[False]:=CreateNode(AParent,lisNodeDependencies,ntDependencies,Nil,AProjectGroup);
PD[True]:=CreateNode(AParent,lisNodeRemovedDependencies,ntRemovedDependencies,Nil,AProjectGroup); PD[True]:=nil; //CreateNode(AParent,lisNodeRemovedDependencies,ntRemovedDependencies,Nil,AProjectGroup);
For i:=0 to T.RequiredPackageCount-1 do For i:=0 to T.RequiredPackageCount-1 do
begin begin
PkgName:=T.RequiredPackages[i].PackageName; PkgName:=T.RequiredPackages[i].PackageName;
@ -1052,7 +1041,7 @@ begin
TVPG.BeginUpdate; TVPG.BeginUpdate;
try try
PF[False]:=CreateNode(AParent,lisNodeFiles,ntFiles,Nil,AProjectGroup); PF[False]:=CreateNode(AParent,lisNodeFiles,ntFiles,Nil,AProjectGroup);
PF[True]:=CreateNode(AParent,lisNodeRemovedFiles,ntFiles,Nil,AProjectGroup); PF[True]:=nil; //CreateNode(AParent,lisNodeRemovedFiles,ntFiles,Nil,AProjectGroup);
// TODO Ideally, we can show removed files // TODO Ideally, we can show removed files
For I:=0 to T.FileCount-1 do For I:=0 to T.FileCount-1 do
CreateNode(PF[False],DisplayFileName(AProjectGroup, CreateNode(PF[False],DisplayFileName(AProjectGroup,
@ -1073,7 +1062,7 @@ begin
TVPG.BeginUpdate; TVPG.BeginUpdate;
try try
PF[False]:=CreateNode(AParent,lisNodeFiles,ntFiles,Nil,AProjectGroup); PF[False]:=CreateNode(AParent,lisNodeFiles,ntFiles,Nil,AProjectGroup);
PF[True]:=CreateNode(AParent,lisNodeRemovedFiles,ntFiles,Nil,AProjectGroup); PF[True]:=nil; //CreateNode(AParent,lisNodeRemovedFiles,ntFiles,Nil,AProjectGroup);
// ToDo Ideally, we can show removed files // ToDo Ideally, we can show removed files
For I:=0 to T.FileCount-1 do For I:=0 to T.FileCount-1 do
CreateNode(PF[False],DisplayFileName(AProjectGroup, CreateNode(PF[False],DisplayFileName(AProjectGroup,