paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-04 21:30:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: install packages dialog: fixed duplicate search

Browse Source 
git-svn-id: trunk@31105 -
This commit is contained in:
mattias 2011-06-05 22:07:00 +00:00
parent bad0bed938
commit 51b6a754dc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packager/installpkgsetdlg.pas
View File

@ -94,7 +94,7 @@ type
FNewInstalledPackages: TObjectList;
FOldInstalledPackages: TPkgDependency;
FOnCheckInstallPackageList: TOnCheckInstallPackageList;
fPackages: TAVLTree;// tree of TLazPackageID (all available packages and links)
fAvailablePackages: TAVLTree;// tree of TLazPackageID (all available packages and links)
FRebuildIDE: boolean;
FSelectedPkg: TLazPackage;
ImgIndexPackage: integer;
@ -200,7 +200,7 @@ begin
HelpButton.Caption:=lisMenuHelp;
CancelButton.Caption:=dlgCancel;
fPackages:=TAVLTree.Create(@CompareLazPackageIDNames);
fAvailablePackages:=TAVLTree.Create(@CompareLazPackageIDNames);
FNewInstalledPackages:=TObjectList.Create(true);
PkgInfoMemo.Clear;
@ -305,7 +305,7 @@ begin
IdleConnected:=false;
ClearNewInstalledPackages;
FNewInstalledPackages.Free;
fPackages.Free;
fAvailablePackages.Free;
end;
procedure TInstallPkgSetDialog.InstallPkgSetDialogResize(Sender: TObject);
@ -434,10 +434,10 @@ begin
exit;
end;
fAvailablePackagesNeedUpdate:=false;
fPackages.Clear;
PackageGraph.IteratePackages(fpfSearchAllExisting,@OnIteratePackages);
if fAvailablePackages.Count=0 then
PackageGraph.IteratePackages(fpfSearchAllExisting,@OnIteratePackages);
sl:=TStringList.Create;
ANode:=fPackages.FindLowest;
ANode:=fAvailablePackages.FindLowest;
while ANode<>nil do begin
Pkg:=TLazPackageID(ANode.Data);
//debugln('TInstallPkgSetDialog.UpdateAvailablePackages ',Pkg.IDAsString,' Pkg.PackageType=',dbgs(ord(Pkg.PackageType)));
@ -451,7 +451,7 @@ begin
sl.AddObject(PkgName,Pkg);
end;
end;
ANode:=fPackages.FindSuccessor(ANode);
ANode:=fAvailablePackages.FindSuccessor(ANode);
end;
sl.Sort;
AvailableTreeView.BeginUpdate;
@ -520,8 +520,8 @@ end;
procedure TInstallPkgSetDialog.OnIteratePackages(APackageID: TLazPackageID);
begin
//debugln('TInstallPkgSetDialog.OnIteratePackages ',APackageID.IDAsString);
if (fPackages.Find(APackageID)=nil) then
fPackages.Add(APackageID);
if (fAvailablePackages.Find(APackageID)=nil) then
fAvailablePackages.Add(APackageID);
end;
function TInstallPkgSetDialog.DependencyToStr(Dependency: TPkgDependency