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

IDE: find in fiels: reduced fResultList updates

Browse Source 
git-svn-id: trunk@14424 -
This commit is contained in:
mattias 2008-03-05 11:56:27 +00:00
parent 2bbb89db49
commit fc8080d388
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ide/searchfrm.pas
View File

@ -70,6 +70,7 @@ type
fPromptOnReplace: boolean;
fRecursive: boolean;
FReplaceText: string;
fResultsListUpdating: boolean;
fResultsList: TStrings;
fResultsWindow: integer;
fSearchFileList: TStringList;
@ -81,6 +82,7 @@ type
fAborting: boolean;
procedure DoFindInFiles(TheFileName: string);
procedure DoFindInSearchList;
procedure SetResultsList(const AValue: TStrings);
procedure UpdateMatches;
procedure UpdateProgress(FileName: string);
function PadAndShorten(FileName: string): string;
@ -89,7 +91,7 @@ type
procedure SearchFile(const aFilename: string);
procedure SetFlag(Flag: TSrcEditSearchOption; AValue: boolean);
public
Procedure DoSearch;
procedure DoSearch;
property SearchDirectory: string read fTheDirectory write fTheDirectory;
property SearchText: string read fSearchFor write fSearchFor;
property ReplaceText: string read FReplaceText write FReplaceText;
@ -97,7 +99,7 @@ type
write SetOptions;
property SearchFileList: TStringList read fSearchFileList
write fSearchFileList;
property ResultsList: TStrings read fResultsList write fResultsList;
property ResultsList: TStrings read fResultsList write SetResultsList;
property SearchMask: string read fMask write fMask;
property Pad: string read fPad write fPad;
property ResultsWindow: integer read fResultsWindow write fResultsWindow;
@ -704,15 +706,24 @@ begin
fMatches:= 0;
if Assigned(fResultsList) then
begin
if fSearchFiles then
begin
DoFindInFiles(fTheDirectory);
end;//if
if fSearchProject or fSearchOpen then
DoFindInSearchList;
fResultsList.BeginUpdate;
fResultsListUpdating:=true;
try
if fSearchFiles then
begin
DoFindInFiles(fTheDirectory);
end;//if
if fSearchProject or fSearchOpen then
DoFindInSearchList;
if Assigned(fResultsList) and (fResultsList.Count = 0) then
fResultsList.Add(lisFileNotFound);
finally
if fResultsListUpdating then begin
fResultsListUpdating:=false;
fResultsList.EndUpdate;
end;
end;
end;//if
if Assigned(fResultsList) and (fResultsList.Count = 0) then
fResultsList.Add(lisFileNotFound);
Close;
end;//DoSearch
@ -809,17 +820,27 @@ begin
begin
UpdateProgress(fSearchFileList[i]);
SearchFile(fSearchFileList[i]);
end;//for
end;//if
end;//DoFindInSearchList
end;
end;
end;
procedure TSearchForm.SetResultsList(const AValue: TStrings);
begin
if fResultsList=AValue then exit;
if fResultsListUpdating then
begin
fResultsList.EndUpdate;
fResultsListUpdating:=false;
end;
fResultsList:=AValue;
end;
procedure TSearchForm.UpdateMatches;
begin
inc(fMatches);
//DebugLn(['TSearchForm.UpdateMatches ',lblMatches.Caption]);
lblMatches.Caption:=IntToStr(fMatches);
end;//UpdateMatches
end;
procedure TSearchForm.UpdateProgress(FileName: string);
var