mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-05 16:38:14 +02:00
LCL: added TFileSearcher.Search AMaskSeparator parameter
git-svn-id: trunk@13261 -
This commit is contained in:
parent
70b65d397f
commit
e25982fd40
@ -764,9 +764,10 @@ var
|
||||
F: String;
|
||||
begin
|
||||
F := FileName;
|
||||
//DebugLn(['TLazFileSearcher.DoFileFound ',Filename]);
|
||||
if FileIsReadable(F) and FileIsText(F) then
|
||||
begin
|
||||
//DebugLn('TLazFileSearcher.DoFileFound ' + F);
|
||||
//DebugLn('TLazFileSearcher.DoFileFound text file: ' + F);
|
||||
FParent.UpdateProgress(F);
|
||||
FParent.SearchFile(F);
|
||||
end;
|
||||
@ -792,7 +793,7 @@ begin
|
||||
begin
|
||||
Searcher := TLazFileSearcher.Create(Self);
|
||||
try
|
||||
Searcher.Search(TheFileName, FMask, FRecursive);
|
||||
Searcher.Search(TheFileName, FMask, FRecursive,';');
|
||||
finally
|
||||
Searcher.Free;
|
||||
end;
|
||||
|
@ -4686,7 +4686,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
IDEDialogLayoutList.SaveLayout(FindInFilesDialog);
|
||||
end;
|
||||
|
||||
procedure TSourceNotebook.ShowSearchResultsView;
|
||||
|
@ -150,7 +150,7 @@ type
|
||||
constructor Create;
|
||||
|
||||
procedure Search(const ASearchPath: String; ASearchMask: String = '';
|
||||
ASearchSubDirs: Boolean = True);
|
||||
ASearchSubDirs: Boolean = True; AMaskSeparator: char = PathSeparator);
|
||||
public
|
||||
property OnDirectoryFound: TDirectoryFoundEvent read FOnDirectoryFound write FOnDirectoryFound;
|
||||
property OnFileFound: TFileFoundEvent read FOnFileFound write FOnFileFound;
|
||||
|
@ -1434,8 +1434,8 @@ begin
|
||||
FSearching := False;
|
||||
end;
|
||||
|
||||
procedure TFileSearcher.Search(const ASearchPath: String; ASearchMask: String = '';
|
||||
ASearchSubDirs: Boolean = True);
|
||||
procedure TFileSearcher.Search(const ASearchPath: String; ASearchMask: String;
|
||||
ASearchSubDirs: Boolean; AMaskSeparator: char);
|
||||
var
|
||||
MaskList: TMaskList;
|
||||
|
||||
@ -1504,7 +1504,7 @@ var
|
||||
begin
|
||||
if FSearching then RaiseSearchingError;
|
||||
|
||||
MaskList := TMaskList.Create(ASearchMask);
|
||||
MaskList := TMaskList.Create(ASearchMask,AMaskSeparator);
|
||||
// empty mask = all files mask
|
||||
if MaskList.Count = 0 then FreeAndNil(MaskList);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user