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

fixed find Text at cursor for Find In Files

Browse Source 
git-svn-id: trunk@6302 -
This commit is contained in:
mattias 2004-11-27 13:11:14 +00:00
parent 25a5c4bc8b
commit 8a153d0041
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ide/uniteditor.pp
View File

@ -3505,12 +3505,11 @@ Begin
if TempEditor <> nil then TempEditor.FindPrevious;
End;
//FindInFiles
function TSourceNotebook.CreateFindInFilesDialog: TLazFindInFilesDialog;
begin
Result := TLazFindInFilesDialog.Create(Application);
LoadFindInFilesHistory(Result);
end;//CreateFindInFilesDialog
end;
procedure TSourceNotebook.LoadFindInFilesHistory(ADialog: TLazFindInFilesDialog);
procedure AssignToComboBox(AComboBox: TComboBox; Strings: TStrings);
@ -3524,7 +3523,11 @@ begin
begin
with ADialog, InputHistories do
begin
AssignToComboBox(TextToFindComboBox, FindHistory);
TextToFindComboBox.Items.Assign(FindHistory);
if not EditorOpts.FindTextAtCursor then begin
if TextToFindComboBox.Items.Count>0 then
TextToFindComboBox.ItemIndex:=0;
end;
AssignToComboBox(DirectoryComboBox, FindInFilesPathHistory);
AssignToComboBox(FileMaskComboBox, FindInFilesMaskHistory);
Options:=FindInFilesSearchOptions;
@ -3561,19 +3564,19 @@ begin
AnUnitInfo:=AProject.FirstPartOfProject;
while AnUnitInfo<>nil do begin
//Only if file exists on disk.
if FilenameIsAbsolute(AnUnitInfo.FileName) and
FileExists(AnUnitInfo.FileName) then
if FilenameIsAbsolute(AnUnitInfo.FileName)
and FileExists(AnUnitInfo.FileName) then
TheFileList.Add(AnUnitInfo.FileName);
AnUnitInfo:=AnUnitInfo.NextPartOfProject;
end;//while
end;
SearchForm:= FIFCreateSearchForm(ADialog);
SearchForm.SearchFileList:= TheFileList;
DoFindInFiles(SearchForm);
finally
FreeAndNil(TheFileList);
FreeAndNil(SearchForm);
end;//finally
end;//FIFSearchProject
end;
end;
procedure TSourceNoteBook.FIFSearchDir(ADialog: TLazFindInFilesDialog);
var
@ -3691,16 +3694,15 @@ begin
if FindInFilesDialog.ShowModal=mrOk then
begin
SaveFindInFilesHistory(FindInFilesDialog);
LoadFindInFilesHistory(FindInFilesDialog);
if FindInFilesDialog.FindText <>'' then
begin
case FindInFilesDialog.WhereRadioGroup.ItemIndex of
Integer(0): FIFSearchProject(AProject, FindInFilesDialog);
integer(1): FIFSearchOpenFiles(FindInFilesDialog);
integer(2): FIFSearchDir(FindInFilesDialog);
end;//case
end;//if
end;//if
end;
end;
end;
IDEDialogLayoutList.SaveLayout(FindInFilesDialog);
end;