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

LCL: added TFileSearcher.Search AMaskSeparator parameter

Browse Source 
git-svn-id: trunk@13261 -
This commit is contained in:
mattias 2007-12-10 12:14:14 +00:00
parent 70b65d397f
commit e25982fd40
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ide/searchfrm.pas
View File

@ -764,9 +764,10 @@ var
F: String; F: String;
begin begin
F := FileName; F := FileName;
//DebugLn(['TLazFileSearcher.DoFileFound ',Filename]);
if FileIsReadable(F) and FileIsText(F) then if FileIsReadable(F) and FileIsText(F) then
begin begin
//DebugLn('TLazFileSearcher.DoFileFound ' + F); //DebugLn('TLazFileSearcher.DoFileFound text file: ' + F);
FParent.UpdateProgress(F); FParent.UpdateProgress(F);
FParent.SearchFile(F); FParent.SearchFile(F);
end; end;
@ -792,7 +793,7 @@ begin
begin begin
Searcher := TLazFileSearcher.Create(Self); Searcher := TLazFileSearcher.Create(Self);
try try
Searcher.Search(TheFileName, FMask, FRecursive); Searcher.Search(TheFileName, FMask, FRecursive,';');
finally finally
Searcher.Free; Searcher.Free;
end; end;

1
ide/uniteditor.pp
View File

@ -4686,7 +4686,6 @@ begin
end; end;
end; end;
end; end;
IDEDialogLayoutList.SaveLayout(FindInFilesDialog);
end; end;
procedure TSourceNotebook.ShowSearchResultsView; procedure TSourceNotebook.ShowSearchResultsView;

2
lcl/fileutil.pas
View File

@ -150,7 +150,7 @@ type
constructor Create; constructor Create;
procedure Search(const ASearchPath: String; ASearchMask: String = ''; procedure Search(const ASearchPath: String; ASearchMask: String = '';
ASearchSubDirs: Boolean = True); ASearchSubDirs: Boolean = True; AMaskSeparator: char = PathSeparator);
public public
property OnDirectoryFound: TDirectoryFoundEvent read FOnDirectoryFound write FOnDirectoryFound; property OnDirectoryFound: TDirectoryFoundEvent read FOnDirectoryFound write FOnDirectoryFound;
property OnFileFound: TFileFoundEvent read FOnFileFound write FOnFileFound; property OnFileFound: TFileFoundEvent read FOnFileFound write FOnFileFound;

6
lcl/include/fileutil.inc
View File

@ -1434,8 +1434,8 @@ begin
FSearching := False; FSearching := False;
end; end;
procedure TFileSearcher.Search(const ASearchPath: String; ASearchMask: String = ''; procedure TFileSearcher.Search(const ASearchPath: String; ASearchMask: String;
ASearchSubDirs: Boolean = True); ASearchSubDirs: Boolean; AMaskSeparator: char);
var var
MaskList: TMaskList; MaskList: TMaskList;
@ -1504,7 +1504,7 @@ var
begin begin
if FSearching then RaiseSearchingError; if FSearching then RaiseSearchingError;
MaskList := TMaskList.Create(ASearchMask); MaskList := TMaskList.Create(ASearchMask,AMaskSeparator);
// empty mask = all files mask // empty mask = all files mask
if MaskList.Count = 0 then FreeAndNil(MaskList); if MaskList.Count = 0 then FreeAndNil(MaskList);