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

IDE and Packages: Use the modified API of ListFilterEdit

Browse Source 
git-svn-id: trunk@31531 -
This commit is contained in:
juha 2011-07-03 06:56:11 +00:00
parent 7fca7f03ef
commit fa305c9084
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ide/projectinspector.pas
View File

@ -152,7 +152,7 @@ type
procedure SetShowDirectoryHierarchy(const AValue: boolean);
procedure SetSortAlphabetically(const AValue: boolean);
procedure SetupComponents;
function ChooseImageIndex(Str: String; Data: TObject): Integer;
function ChooseImageIndex(Str: String; Data: TObject; var IsEnabled: Boolean): Integer;
procedure UpdateProjectFiles(Immediately: boolean);
procedure UpdateRequiredPackages;
procedure UpdateRemovedRequiredPackages;
@ -516,7 +516,7 @@ begin
FShowDirectoryHierarchy:=AValue;
DirectoryHierarchySpeedButton.Down:=FShowDirectoryHierarchy;
FilterEdit.ShowDirHierarchy:=FShowDirectoryHierarchy;
FilterEdit.Invalidate;
FilterEdit.InvalidateFilter;
end;
procedure TProjectInspectorForm.SetSortAlphabetically(const AValue: boolean);
@ -525,7 +525,7 @@ begin
FSortAlphabetically:=AValue;
SortAlphabeticallySpeedButton.Down:=SortAlphabetically;
FilterEdit.SortData:=SortAlphabetically;
FilterEdit.Invalidate;
FilterEdit.InvalidateFilter;
end;
procedure TProjectInspectorForm.SetDependencyDefaultFilename(AsPreferred: boolean);
@ -600,8 +600,10 @@ begin
end;
end;
function TProjectInspectorForm.ChooseImageIndex(Str: String; Data: TObject): Integer;
function TProjectInspectorForm.ChooseImageIndex(Str: String; Data: TObject;
var IsEnabled: Boolean): Integer;
begin
IsEnabled:=True;
if FilenameIsPascalUnit((Data as TUnitInfo).Filename) then
Result:=ImageIndexUnit
else if (LazProject<>nil) and (LazProject.MainUnitinfo=Data) then
@ -638,7 +640,7 @@ begin
end;
CurFile:=CurFile.NextPartOfProject;
end;
FilterEdit.Invalidate; // Data is shown by FilterEdit.
FilterEdit.InvalidateFilter; // Data is shown by FilterEdit.
end;
procedure TProjectInspectorForm.UpdateRequiredPackages;

7
packager/installpkgsetdlg.pas
View File

@ -100,7 +100,7 @@ type
procedure SetOldInstalledPackages(const AValue: TPkgDependency);
procedure AssignOldInstalledPackagesToList;
function PackageInInstallList(PkgName: string): boolean;
function ChooseImageIndex(Str: String; Data: TObject): Integer;
function ChooseImageIndex(Str: String; Data: TObject; var IsEnabled: Boolean): Integer;
procedure UpdateAvailablePackages(Immediately: boolean = false);
procedure UpdateNewInstalledPackages;
procedure OnIteratePackages(APackageID: TLazPackageID);
@ -354,7 +354,8 @@ begin
Result:=false;
end;
function TInstallPkgSetDialog.ChooseImageIndex(Str: String; Data: TObject): Integer;
function TInstallPkgSetDialog.ChooseImageIndex(Str: String; Data: TObject;
var IsEnabled: Boolean): Integer;
var
Pkg: TLazPackageID;
APackage: TLazPackage;
@ -391,7 +392,7 @@ begin
end;
ANode:=fAvailablePackages.FindSuccessor(ANode);
end;
AvailableFilterEdit.Invalidate;
AvailableFilterEdit.InvalidateFilter;
end;
procedure TInstallPkgSetDialog.UpdateNewInstalledPackages;

17
packager/packageeditor.pas
View File

@ -244,7 +244,7 @@ type
procedure SetShowDirectoryHierarchy(const AValue: boolean);
procedure SetSortAlphabetically(const AValue: boolean);
procedure SetupComponents;
function ChooseImageIndex(Str: String; Data: TObject): Integer;
function ChooseImageIndex(Str: String; Data: TObject; var IsEnabled: Boolean): Integer;
procedure UpdateTitle;
procedure UpdateButtons;
procedure UpdateFiles;
@ -1553,7 +1553,7 @@ begin
FShowDirectoryHierarchy:=AValue;
DirectoryHierarchySpeedButton.Down:=FShowDirectoryHierarchy;
FilterEdit.ShowDirHierarchy:=FShowDirectoryHierarchy;
FilterEdit.Invalidate;
FilterEdit.InvalidateFilter;
end;
procedure TPackageEditorForm.SetSortAlphabetically(const AValue: boolean);
@ -1562,7 +1562,7 @@ begin
FSortAlphabetically:=AValue;
SortAlphabeticallySpeedButton.Down:=FSortAlphabetically;
FilterEdit.ShowDirHierarchy:=FShowDirectoryHierarchy;
FilterEdit.Invalidate;
FilterEdit.InvalidateFilter;
end;
procedure TPackageEditorForm.UpdateAll(Immediately: boolean);
@ -1606,8 +1606,10 @@ begin
OptionsBitBtn.Enabled:=true;
end;
function TPackageEditorForm.ChooseImageIndex(Str: String; Data: TObject): Integer;
function TPackageEditorForm.ChooseImageIndex(Str: String; Data: TObject;
var IsEnabled: Boolean): Integer;
begin
IsEnabled:=True;
case TPkgFile(Data).FileType of
pftUnit,pftVirtualUnit,pftMainUnit:
if TPkgFile(Data).HasRegisterProc then
@ -1633,6 +1635,7 @@ var
NextNode: TTreeNode;
Filename: String;
TVNodeStack: TFPList;
ena: Boolean;
begin
if LazPackage=nil then exit;
FilterEdit.RootNode:=FFilesNode;
@ -1650,7 +1653,7 @@ begin
FilterEdit.MapShortToFullFilename(Filename, CurFile.Filename);
end;
end;
FilterEdit.Invalidate; // Data is shown by FilterEdit.
FilterEdit.InvalidateFilter; // Data is shown by FilterEdit.
// removed files
if LazPackage.RemovedFilesCount>0 then begin
@ -1667,8 +1670,8 @@ begin
if CurNode=nil then
CurNode:=FilesTreeView.Items.AddChild(FRemovedFilesNode,'');
CurFile:=LazPackage.RemovedFiles[i];
CurNode.Text:=CurFile.GetShortFilename(true);
CurNode.ImageIndex:=ChooseImageIndex('', CurFile); // SetImageIndex(CurNode,CurFile);
CurNode.Text:=CurFile.GetShortFilename(true); // SetImageIndex(CurNode,CurFile);
CurNode.ImageIndex:=ChooseImageIndex('', CurFile, ena);
CurNode:=CurNode.GetNextSibling;
end;
while CurNode<>nil do begin