* Add file search option to search file tree

2025-04-05 10:37:58 +02:00 · 2024-09-25 09:31:39 +02:00 · 2024-09-25 09:31:39 +02:00 · 3f9a5b7e64
commit 3f9a5b7e64
parent 514fadb9ca
9 changed files with 585 additions and 55 deletions
--- a/components/filebrowser/ctrlfilebrowser.pas
+++ b/components/filebrowser/ctrlfilebrowser.pas
@ -5,10 +5,13 @@ unit ctrlfilebrowser;
 interface

 uses
-  Classes, SysUtils, frmFileBrowser, forms, filebrowsertypes, SrcEditorIntf,
+  Classes, SysUtils, frmFileBrowser, forms, filebrowsertypes, SrcEditorIntf, Masks,
  LazIDEIntf, MenuIntf, IDECommands, ProjectIntf, IDEOptEditorIntf, IDEWindowIntf, BaseIDEIntf;

 Type
+    TFileSearchOption = (fsoMatchOnlyFileName,fsoAbsolutePaths);
+    TFileSearchOptions = Set of TFileSearchOption;
+
   { TFileBrowserController }
    TFileBrowserController = class(TComponent)
    private
@ -16,6 +19,9 @@ Type
      FCustomStartDir: string;
      FDirectoriesBeforeFiles: Boolean;
      FLastOpenedDir: string;
+      FMatchOnlyFileName: Boolean;
+      FRoot: TFileSystemEntry;
+      FSearchOptions: TFileSearchOptions;
      FStartDir: TStartDir;
      FRootDir : TRootDir;
      FFilesInTree : Boolean;
@ -24,12 +30,15 @@ Type
      FSplitterPos: integer;
      FCurrentEditorFile : String;
      FSyncCurrentEditor: Boolean;
+      FTreeFiller : TTreeCreatorThread;
+      FFileList : TStrings;
      procedure ActiveEditorChanged(Sender: TObject);
+      procedure AddFileNodes(List: TStrings; aNode: TFileSystemEntry; aDir: String);
+      procedure CreateFileList(aUseAbsolutePaths: boolean);
      function DoProjectChanged(Sender: TObject; AProject: TLazProject): TModalResult;
      procedure DoSelectDir(Sender: TObject);
      function GetProjectDir: String;
      function GetResolvedStartDir: String;
-      procedure ReadConfig; virtual;
      procedure SetCustomRootDir(AValue: string);
      procedure SetCustomStartDir(AValue: string);
      procedure SetDirectoriesBeforeFiles(AValue: Boolean);
@ -40,20 +49,27 @@ Type
      procedure SetStartDir(AValue: TStartDir);
      procedure SetSyncCurrentEditor(AValue: Boolean);
      procedure OnFormClose(Sender: TObject; var {%H-}CloseAction: TCloseAction);
+      procedure TreeFillDone(Sender: TThread; aTree: TDirectoryEntry);
    protected
      { Called by file browser window }
      procedure DoOpenFile(Sender: TObject; const AFileName: string); virtual;
      { Called by file browser window }
      procedure DoConfig(Sender: TObject);
      procedure SyncCurrentFile;
+      function FillingTree: boolean;
    public
      constructor Create(AOwner: TComponent); override;
      destructor Destroy; override;
      procedure ConfigWindow(AForm: TFileBrowserForm); virtual;
+      procedure OpenFiles(aEntries : TFileEntryArray);
      function GetResolvedRootDir : String;
      function ShowConfig: Boolean;
      procedure WriteConfig; virtual;
+      procedure ReadConfig; virtual;
+      procedure IndexRootDir;
+      function FindFiles(aPattern: String; aList: TStrings; aMatchOnlyFileName: boolean; aMask : TMaskList): Integer;
      procedure Notification(AComponent: TComponent; Operation: TOperation); override;
+      Property Root : TFileSystemEntry Read FRoot;
      property StartDir: TStartDir read FStartDir write SetStartDir;
      property RootDir: TRootDir read FRootDir write SetRootDir;
      property CustomStartDir: string read FCustomStartDir write SetCustomStartDir;
@ -64,19 +80,78 @@ Type
      Property FilesInTree : Boolean Read FFilesInTree Write SetFilesInTree;
      Property DirectoriesBeforeFiles : Boolean Read FDirectoriesBeforeFiles Write SetDirectoriesBeforeFiles;
      Property ConfigFrame : TAbstractIDEOptionsEditorClass Read FConfigFrame Write FConfigFrame;
+      property SearchOptions : TFileSearchOptions Read FSearchOptions Write FSearchOptions;
    end;


 implementation

-uses LazConfigStorage;
+uses StrUtils, LazConfigStorage;

 { TFileBrowserController }

+procedure TFileBrowserController.TreeFillDone(Sender: TThread; aTree: TDirectoryEntry);
+
+begin
+  if (FTreeFiller<>Sender) then exit;
+  FTreeFiller:=Nil;
+  FreeAndNil(FRoot);
+  FRoot:=aTree;
+  CreateFileList(fsoAbsolutePaths in SearchOptions);
+end;
+
+procedure TFileBrowserController.AddFileNodes(List : TStrings; aNode : TFileSystemEntry; aDir : String);
+
+var
+  FN : String;
+  i : Integer;
+
+begin
+  FN:=aDir;
+  if FN<>'' then
+     FN:=IncludeTrailingPathDelimiter(FN);
+  FN:=FN+aNode.Name;
+  case aNode.EntryType of
+  etFile,
+  etSymlink:
+    List.AddObject(FN,aNode);
+  etDirectory:
+    For I:=0 to ANode.EntryCount-1 do
+      AddFileNodes(List,ANode.Entries[I],FN);
+  end;
+end;
+
+procedure TFileBrowserController.CreateFileList(aUseAbsolutePaths : boolean);
+
+var
+  lList,l2 : TStrings;
+  lDir : String;
+begin
+  l2:=Nil;
+  lList:=TStringList.Create;
+  try
+    if aUseAbsolutePaths then
+      lDir:=GetResolvedRootDir
+    else
+      lDir:='';
+    AddFileNodes(lList,FRoot,lDir);
+    l2:=FFileList;
+    FFileList:=lList;
+  except
+    lList.Free;
+    Raise;
+  end;
+  FreeAndNil(L2);
+end;
+
 procedure TFileBrowserController.ReadConfig;
 var
  Storage : TConfigStorage;
+  Opts : TFileSearchOptions;
+
+
 begin
+  Opts:=[];
  Storage:=GetIDEConfigStorage(SConfigFile, True);
  with Storage do
    try
@ -88,6 +163,11 @@ begin
      FFilesInTree:=GetValue(KeyFilesInTree, DefaultFilesInTree);
      FDirectoriesBeforeFiles:=GetValue(KeyDirectoriesBeforeFiles,DefaultDirectoriesBeforeFiles);
      FSyncCurrentEditor:=GetValue(KeySyncCurrentEditor,DefaultSyncCurrentEditor);
+      if GetValue(KeySearchMatchOnlyFilename,False) then
+        Include(Opts,fsoMatchOnlyFileName);
+      if GetValue(KeySearchAbsoluteFilenames,False) then
+        Include(Opts,fsoAbsolutePaths);
+      SearchOptions:=Opts;
    finally
      Free;
    end;
@ -174,12 +254,53 @@ begin
      SetDeleteValue(KeyFilesInTree, FFilesInTree, DefaultFilesInTree);
      SetDeleteValue(KeyDirectoriesBeforeFiles, FDirectoriesBeforeFiles, DefaultDirectoriesBeforeFiles);
      SetDeleteValue(KeySyncCurrentEditor,FSyncCurrentEditor, DefaultSyncCurrentEditor);
+      SetDeleteValue(KeySearchMatchOnlyFilename,fsoMatchOnlyFileName in SearchOptions,False);
+      SetDeleteValue(KeySearchAbsoluteFilenames,fsoAbsolutePaths in SearchOptions,False);
      FNeedSave := False;
    finally
      Free;
    end;
 end;

+function TFileBrowserController.FillingTree : boolean;
+
+begin
+  Result:=Assigned(FTreeFiller);
+end;
+
+procedure TFileBrowserController.IndexRootDir;
+
+begin
+  if FillingTree then
+    Exit;
+  // Do not recurse, thread handles it, it needs to react to terminate...
+  FTreeFiller:=TTreeCreatorThread.Create(GetResolvedRootDir,[],@TreeFillDone);
+end;
+
+function TFileBrowserController.FindFiles(aPattern: String; aList: TStrings; aMatchOnlyFileName: boolean; aMask: TMaskList
+  ): Integer;
+
+var
+  s,fn,ptrn : String;
+  i,ps : integer;
+
+begin
+  Result:=0;
+  if (FFileList=Nil) or (Length(aPattern)<2) then exit;
+  ptrn:=LowerCase(aPattern);
+  For I:=0 to FFileList.Count-1 do
+    begin
+    S:=FFileList[i];
+    if aMatchOnlyFileName then
+      ps:=rpos(PathDelim,S)
+    else
+      ps:=1;
+    if (Pos(ptrn,LowerCase(S),Ps)>0) then
+      if (aMask=Nil) or (aMask.Matches(ExtractFileName(S))) then
+        aList.AddObject(S,FFileList.Objects[i]);
+    end;
+end;
+
 procedure TFileBrowserController.ConfigWindow(AForm: TFileBrowserForm);

 begin
@ -199,6 +320,16 @@ begin
    SyncCurrentFile;
 end;

+procedure TFileBrowserController.OpenFiles(aEntries: TFileEntryArray);
+
+var
+  E : TFileEntry;
+
+begin
+  for E in aEntries do
+    DoOpenFile(Self,E.AbsolutePath);
+end;
+
 function TFileBrowserController.GetProjectDir : String;

 begin
@ -237,6 +368,7 @@ begin
  LazarusIDE.DoOpenEditorFile(AFileName, 0, 0, Flags);
 end;

+
 procedure TFileBrowserController.OnFormClose(Sender: TObject;
  var CloseAction: TCloseAction);
 begin
@ -304,6 +436,10 @@ end;

 destructor TFileBrowserController.Destroy;
 begin
+  if Assigned(FTreeFiller) then
+    FTreeFiller.Terminate;
+  FreeAndNil(FFileList);
+  FreeAndNil(FRoot);
  if SourceEditorManagerIntf <> nil then
    SourceEditorManagerIntf.UnRegisterChangeEvent(semEditorActivate,@ActiveEditorChanged);
  if FNeedSave then
--- a/components/filebrowser/filebrowsertypes.pas
+++ b/components/filebrowser/filebrowsertypes.pas
@ -46,6 +46,7 @@ Type
    Property Name : String Read FName;
    Property Parent : TFileSystemEntry Read FParent;
  end;
+  TFileSystemEntryArray = Array of TFileSystemEntry;

  { TSymlinkEntry }

@ -82,6 +83,22 @@ Type
  TFileEntry = Class(TFileSystemEntry)
    Class function EntryType : TEntryType; override;
  end;
+  TFileEntryArray = Array of TFileEntry;
+
+  TTreeDoneEvent = procedure (Sender : TThread; aTree : TDirectoryEntry) of object;
+
+  { TTreeCreatorThread }
+
+  TTreeCreatorThread = Class(TThread)
+  Private
+    FRootDir : String;
+    FOptions : TReadEntryOptions;
+    FOnDone : TTreeDoneEvent;
+    procedure FillNode(N: TDirectoryEntry);
+  Public
+    constructor Create(aRootDir: String; aOptions: TReadEntryOptions; aOnDone: TTreeDoneEvent);
+    procedure execute; override;
+  end;


 const
@ -101,9 +118,12 @@ const
  KeyFilesInTree      = 'FilesInTree';
  KeyDirectoriesBeforeFiles     = 'DirectoriesBeforeFiles';
  KeySyncCurrentEditor = 'SyncCurrentEditor';
+  KeySearchMatchOnlyFilename = 'MatchOnlyFileNames';
+  KeySearchAbsoluteFilenames = 'AbsoluteFileNames';

 resourcestring
  SFileBrowserIDEMenuCaption = 'File Browser';
+  SFileSearcherIDEMenuCaption = 'File Searcher';


 implementation
@ -347,5 +367,54 @@ begin
  Result:=etFile;
 end;

+{ TTreeCreatorThread }
+
+constructor TTreeCreatorThread.Create(aRootDir: String; aOptions: TReadEntryOptions; aOnDone : TTreeDoneEvent);
+begin
+  FRootDir:=aRootDir;
+  FOptions:=aOptions;
+  FOnDone:=aOnDone;
+  Inherited Create(false);
+end;
+
+procedure TTreeCreatorThread.FillNode(N : TDirectoryEntry);
+
+var
+  i : integer;
+
+begin
+  N.ReadEntries(FOptions);
+  For I:=0 to N.EntryCount-1 do
+    begin
+    if terminated then
+      break;
+    if N.Entries[I].EntryType=etDirectory then
+      FillNode(TDirectoryEntry(N.Entries[I]));
+    end;
+end;
+
+procedure TTreeCreatorThread.execute;
+
+var
+  FNode : TDirectoryEntry;
+
+begin
+  FNode:=TDirectoryEntry.Create(Nil,FRootDir);
+  try
+    FillNode(FNode);
+    if Not Terminated then
+      begin
+      if Assigned(FOnDOne) then
+        begin
+        FOnDone(Self,FNode);
+        // Caller is responsible for freeing now...
+        FNode:=Nil;
+        end;
+      end;
+  finally
+    FNode.Free;
+  end;
+end;
+
 end.

--- a/components/filebrowser/fraconfigfilebrowser.lfm
+++ b/components/filebrowser/fraconfigfilebrowser.lfm
@ -1,13 +1,13 @@
 object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
  Left = 0
-  Height = 456
+  Height = 582
  Top = 0
  Width = 803
-  ClientHeight = 456
+  ClientHeight = 582
  ClientWidth = 803
  TabOrder = 0
-  DesignLeft = 828
-  DesignTop = 271
+  DesignLeft = 616
+  DesignTop = 247
  object GBStartDir1: TGroupBox
    Left = 0
    Height = 191
@ -15,12 +15,12 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
    Width = 803
    Align = alTop
    Caption = 'Root directory'
-    ClientHeight = 173
+    ClientHeight = 174
    ClientWidth = 801
    TabOrder = 0
    object DERootDir: TDirectoryEdit
      Left = 38
-      Height = 34
+      Height = 28
      Top = 128
      Width = 754
      ShowHidden = False
@ -34,7 +34,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 16
      Height = 23
      Top = 96
-      Width = 191
+      Width = 175
      Caption = 'Always use this directory'
      TabOrder = 1
    end
@ -42,7 +42,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 14
      Height = 23
      Top = 36
-      Width = 131
+      Width = 118
      Caption = 'Filesystem root'
      TabOrder = 2
    end
@ -50,7 +50,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 14
      Height = 23
      Top = 9
-      Width = 220
+      Width = 197
      Caption = 'Use current project directory'
      Checked = True
      TabOrder = 3
@ -60,7 +60,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 14
      Height = 23
      Top = 64
-      Width = 122
+      Width = 110
      Caption = 'User directory'
      TabOrder = 4
    end
@ -72,12 +72,12 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
    Width = 803
    Align = alTop
    Caption = 'Initial directory'
-    ClientHeight = 134
+    ClientHeight = 135
    ClientWidth = 801
    TabOrder = 1
    object DEStartDir: TDirectoryEdit
      Left = 38
-      Height = 34
+      Height = 28
      Top = 89
      Width = 752
      ShowHidden = False
@ -91,7 +91,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 14
      Height = 23
      Top = 65
-      Width = 191
+      Width = 175
      Caption = 'Always use this directory'
      TabOrder = 1
    end
@ -99,7 +99,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 14
      Height = 23
      Top = 36
-      Width = 198
+      Width = 179
      Caption = 'Use last opened directory'
      TabOrder = 2
    end
@ -107,43 +107,81 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
      Left = 14
      Height = 23
      Top = 8
-      Width = 220
+      Width = 197
      Caption = 'Use current project directory'
      Checked = True
      TabOrder = 3
      TabStop = True
    end
  end
-  object CBShowFilesInline: TCheckBox
-    Left = 24
-    Height = 23
-    Top = 355
-    Width = 207
-    Caption = 'Show files in main tree view'
+  object GBSearch: TGroupBox
+    Left = 0
+    Height = 97
+    Top = 456
+    Width = 803
+    Align = alTop
+    Caption = 'Search'
+    ClientHeight = 80
+    ClientWidth = 801
    TabOrder = 2
-    OnChange = CBShowFilesInlineChange
+    object CBMatchOnlyFilename: TCheckBox
+      Left = 8
+      Height = 23
+      Top = 16
+      Width = 205
+      Caption = 'Search matches only filename'
+      TabOrder = 0
+    end
+    object CBUseAbsoluteFilenames: TCheckBox
+      Left = 8
+      Height = 23
+      Top = 48
+      Width = 177
+      Caption = 'Show absolute filenames'
+      TabOrder = 1
+    end
  end
-  object CBShowDirectoriesBeforeFiles: TCheckBox
-    AnchorSideTop.Control = CBShowFilesInline
-    AnchorSideTop.Side = asrBottom
-    Left = 52
-    Height = 23
-    Top = 386
-    Width = 207
-    BorderSpacing.Top = 8
-    Caption = 'Show files in main tree view'
+  object GBFileTree: TGroupBox
+    Left = 0
+    Height = 113
+    Top = 343
+    Width = 803
+    Align = alTop
+    Caption = 'File browser tree'
+    ClientHeight = 96
+    ClientWidth = 801
    TabOrder = 3
-  end
-  object CBSyncCurrentEditor: TCheckBox
-    AnchorSideLeft.Control = CBShowFilesInline
-    AnchorSideTop.Control = CBShowDirectoriesBeforeFiles
-    AnchorSideTop.Side = asrBottom
-    Left = 24
-    Height = 23
-    Top = 417
-    Width = 304
-    BorderSpacing.Top = 8
-    Caption = 'Keep synchronized with current editor file'
-    TabOrder = 4
+    object CBShowFilesInline: TCheckBox
+      Left = 24
+      Height = 23
+      Top = 8
+      Width = 191
+      Caption = 'Show files in main tree view'
+      TabOrder = 0
+      OnChange = CBShowFilesInlineChange
+    end
+    object CBShowDirectoriesBeforeFiles: TCheckBox
+      AnchorSideTop.Control = CBShowFilesInline
+      AnchorSideTop.Side = asrBottom
+      Left = 52
+      Height = 23
+      Top = 39
+      Width = 197
+      BorderSpacing.Top = 8
+      Caption = 'Show directories before files'
+      TabOrder = 1
+    end
+    object CBSyncCurrentEditor: TCheckBox
+      AnchorSideLeft.Control = CBShowFilesInline
+      AnchorSideTop.Control = CBShowDirectoriesBeforeFiles
+      AnchorSideTop.Side = asrBottom
+      Left = 24
+      Height = 23
+      Top = 70
+      Width = 277
+      BorderSpacing.Top = 8
+      Caption = 'Keep synchronized with current editor file'
+      TabOrder = 2
+    end
  end
 end
--- a/components/filebrowser/fraconfigfilebrowser.pas
+++ b/components/filebrowser/fraconfigfilebrowser.pas
@ -15,13 +15,17 @@ type
  { TFileBrowserOptionsFrame }

  TFileBrowserOptionsFrame = class(TAbstractIDEOptionsEditor)
-    CBShowFilesInline: TCheckBox;
    CBShowDirectoriesBeforeFiles: TCheckBox;
+    CBShowFilesInline: TCheckBox;
    CBSyncCurrentEditor: TCheckBox;
+    CBMatchOnlyFilename: TCheckBox;
+    CBUseAbsoluteFilenames: TCheckBox;
    DEStartDir: TDirectoryEdit;
    DERootDir: TDirectoryEdit;
    GBStartDir: TGroupBox;
    GBStartDir1: TGroupBox;
+    GBSearch: TGroupBox;
+    GBFileTree: TGroupBox;
    RBLastDir: TRadioButton;
    RBRootFileSystemRoot: TRadioButton;
    RBRootUserDir: TRadioButton;
@ -104,6 +108,8 @@ begin
  CBShowFilesInline.Checked:=C.FilesInTree;
  CBShowDirectoriesBeforeFiles.Checked:=C.DirectoriesBeforeFiles;
  CBSyncCurrentEditor.Checked:=C.SyncCurrentEditor;
+  CBUseAbsoluteFilenames.Checked:=fsoAbsolutePaths in C.SearchOptions;
+  CBMatchOnlyFilename.Checked:=fsoMatchOnlyFileName in C.SearchOptions;
  CheckDirsBeforeFiles;
 end;

@ -112,11 +118,13 @@ var
  C : TFileBrowserController;
  SD : TStartDir;
  RD : TRootDir;
-
+  SO : TFileSearchOptions;
+  lRootDir: String;
 begin
  C:=LazarusIDE.OwningComponent.FindComponent('IDEFileBrowserController') as TFileBrowserController;
  if not Assigned(C) then
    exit;
+  lRootDir:=C.GetResolvedRootDir;
  if RBUseProjectDir.Checked then
    SD:=sdProjectDir
  else if RBLastDir.Checked then
@ -144,6 +152,15 @@ begin
    C.CustomRootDir:='';
  C.FilesInTree:=CBShowFilesInline.Checked;
  C.SyncCurrentEditor:=CBSyncCurrentEditor.Checked;
+  SO:=[];
+  if CBUseAbsoluteFilenames.Checked then
+    Include(SO,fsoAbsolutePaths);
+  if CBMatchOnlyFilename.Checked then
+    Include(SO,fsoMatchOnlyFileName);
+  C.SearchOptions:=SO;
+  // Re-index
+  if lRootDir<>C.GetResolvedRootDir then
+    C.IndexRootDir;
 end;

 class function TFileBrowserOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
--- a/components/filebrowser/frmfilesearcher.lfm
+++ b/components/filebrowser/frmfilesearcher.lfm
@ -0,0 +1,86 @@
+object FileSearcherForm: TFileSearcherForm
+  Left = 593
+  Height = 214
+  Top = 407
+  Width = 556
+  ActiveControl = edtSearch
+  BorderIcons = [biMaximize]
+  BorderStyle = bsSizeToolWin
+  Caption = 'Search file'
+  ClientHeight = 214
+  ClientWidth = 556
+  Position = poScreenCenter
+  LCLVersion = '3.99.0.0'
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  object bpFileSearch: TButtonPanel
+    Left = 6
+    Height = 38
+    Top = 170
+    Width = 544
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
+    TabOrder = 0
+    ShowButtons = [pbOK, pbCancel]
+  end
+  object Label1: TLabel
+    AnchorSideTop.Control = edtSearch
+    AnchorSideRight.Control = edtSearch
+    AnchorSideBottom.Control = edtSearch
+    AnchorSideBottom.Side = asrBottom
+    Left = 28
+    Height = 28
+    Top = 4
+    Width = 68
+    Alignment = taRightJustify
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    AutoSize = False
+    BorderSpacing.Right = 8
+    Caption = 'Filename'
+    Layout = tlCenter
+  end
+  object edtSearch: TEdit
+    Left = 104
+    Height = 28
+    Top = 4
+    Width = 299
+    Anchors = [akTop, akLeft, akRight]
+    TabOrder = 1
+    TextHint = 'Type filename'
+    OnChange = edtSearchChange
+  end
+  object LBFiles: TListBox
+    Left = 8
+    Height = 125
+    Top = 40
+    Width = 541
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    ItemHeight = 0
+    MultiSelect = True
+    Style = lbOwnerDrawFixed
+    TabOrder = 2
+    TopIndex = -1
+    OnDblClick = LBFilesDblClick
+    OnDrawItem = LBFilesDrawItem
+  end
+  object cbFilter: TFilterComboBox
+    AnchorSideTop.Control = edtSearch
+    AnchorSideBottom.Control = edtSearch
+    AnchorSideBottom.Side = asrBottom
+    Left = 412
+    Height = 28
+    Top = 4
+    Width = 137
+    Anchors = [akTop, akRight, akBottom]
+    Filter = 'Pascal files|*.pas;*.pp;*.inc;*.lpr;*.dpr|All files|*.*'
+    ItemIndex = 0
+    TabOrder = 3
+    OnChange = cbFilterChange
+  end
+end
--- a/components/filebrowser/frmfilesearcher.pas
+++ b/components/filebrowser/frmfilesearcher.pas
@ -0,0 +1,146 @@
+unit frmfilesearcher;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ButtonPanel, ExtCtrls, StdCtrls, FileCtrl, filebrowsertypes,
+  ctrlfilebrowser, Types, Masks;
+
+type
+
+  { TFileSearcherForm }
+
+  TFileSearcherForm = class(TForm)
+    bpFileSearch: TButtonPanel;
+    cbFilter: TFilterComboBox;
+    edtSearch: TEdit;
+    Label1: TLabel;
+    LBFiles: TListBox;
+    procedure cbFilterChange(Sender: TObject);
+    procedure edtSearchChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
+    procedure LBFilesDblClick(Sender: TObject);
+    procedure LBFilesDrawItem(Control: TWinControl; Index: Integer; ARect: TRect; State: TOwnerDrawState);
+  private
+    FMask : TMaskList;
+    FController: TFileBrowserController;
+    procedure DoFilter;
+  public
+    Function GetSelectedItems : TFileEntryArray;
+  end;
+
+var
+  FileSearcherForm: TFileSearcherForm;
+
+implementation
+
+uses LCLType, LazIDEIntf;
+
+{$R *.lfm}
+
+{ TFileSearcherForm }
+
+
+procedure TFileSearcherForm.edtSearchChange(Sender: TObject);
+begin
+  DoFilter;
+end;
+
+procedure TFileSearcherForm.DoFilter;
+
+begin
+  if Not Assigned(FController) or (Length(edtSearch.Text)<2) then
+    exit;
+  LBFiles.Items.BeginUpdate;
+  try
+    LBFiles.Items.Clear;
+    FController.FindFiles(edtSearch.Text,LBFiles.Items,(fsoMatchOnlyFileName in FController.SearchOptions),FMask);
+  finally
+    LBFiles.Items.EndUpdate;
+  end;
+end;
+
+function TFileSearcherForm.GetSelectedItems: TFileEntryArray;
+
+var
+  Idx,I: Integer;
+
+begin
+  Result:=[];
+  SetLength(Result,LBFiles.SelCount);
+  idx:=0;
+  For I:=0 to LBFiles.Count-1 do
+    if LBFiles.Selected[I] then
+      begin
+      Result[Idx]:=TFileEntry(LBFiles.Items.Objects[i]);
+      Inc(Idx);
+      end;
+end;
+
+procedure TFileSearcherForm.cbFilterChange(Sender: TObject);
+begin
+  FreeAndNil(FMask);
+  if cBFilter.Text<>'' then
+    FMask:=TMaskList.Create(cbFilter.Mask);
+  DoFilter;
+end;
+
+procedure TFileSearcherForm.FormCreate(Sender: TObject);
+
+begin
+  FController:=LazarusIDE.OwningComponent.FindComponent('IDEFileBrowserController') as TFileBrowserController;
+  if cbFilter.Mask<>'' then
+    FMask:=TMaskList.Create(cbFilter.Mask);
+end;
+
+procedure TFileSearcherForm.FormDestroy(Sender: TObject);
+begin
+  FreeAndNil(FMask);
+end;
+
+procedure TFileSearcherForm.LBFilesDblClick(Sender: TObject);
+begin
+  Modalresult:=mrOK;
+end;
+
+procedure TFileSearcherForm.LBFilesDrawItem(Control: TWinControl; Index: Integer; ARect: TRect; State: TOwnerDrawState);
+
+Var
+  W,L,P : Integer;
+  lRect : TRect;
+  C : TColor;
+  ls,S,Term : String;
+  lCanvas : TCanvas;
+
+begin
+  lCanvas:=LBFiles.Canvas;
+  S:=LBFiles.Items[Index];
+  LS:=LowerCase(S);
+  Term:=LowerCase(EdtSearch.Text);
+  lRect:=aRect;
+  if not (odSelected in State) then
+    begin
+    c:=lCanvas.Brush.Color;
+    lCanvas.Brush.Color:=clHighlight;
+    W:=lCanvas.TextWidth(Term);
+    P:=Pos(Term,LS);
+    While P<>0 do
+      begin
+      L:=lCanvas.TextWidth(Copy(S,1,P-1));
+      lRect.Left:=aRect.Left+L;
+      lRect.Right:=aRect.Left+L+W;
+      if lrect.Right>aRect.Right then
+        lrect.Right:=aRect.Right;
+      lCanvas.FillRect(lRect);
+      P:=Pos(term,LS,P+Length(term));
+      end;
+    lCanvas.Brush.Color:=C;
+    end;
+  lCanvas.TextRect(aRect,aRect.Left,aRect.Top,S);
+end;
+
+end.
+
--- a/components/filebrowser/idefilebrowser.lpk
+++ b/components/filebrowser/idefilebrowser.lpk
@ -19,7 +19,7 @@
    <Description Value="File browsing window for the Lazarus IDE"/>
    <License Value="Modified LGPL"/>
    <Version Minor="2"/>
-    <Files Count="6">
+    <Files Count="7">
      <Item1>
        <Filename Value="frmfilebrowser.lfm"/>
        <Type Value="LFM"/>
@ -45,6 +45,10 @@
        <Filename Value="filebrowsertypes.pas"/>
        <UnitName Value="filebrowsertypes"/>
      </Item6>
+      <Item7>
+        <Filename Value="frmfilesearcher.pas"/>
+        <UnitName Value="frmfilesearcher"/>
+      </Item7>
    </Files>
    <CompatibilityMode Value="True"/>
    <RequiredPkgs Count="3">
--- a/components/filebrowser/idefilebrowser.pas
+++ b/components/filebrowser/idefilebrowser.pas
@ -8,7 +8,7 @@ unit idefilebrowser;
 interface

 uses
-  frmFileBrowser, RegIDEFileBrowser, fraconfigfilebrowser, ctrlfilebrowser, filebrowsertypes, LazarusPackageIntf;
+  frmFileBrowser, RegIDEFileBrowser, fraconfigfilebrowser, ctrlfilebrowser, filebrowsertypes, frmfilesearcher, LazarusPackageIntf;

 implementation

--- a/components/filebrowser/regidefilebrowser.pp
+++ b/components/filebrowser/regidefilebrowser.pp
@ -16,7 +16,7 @@ procedure Register;

 implementation

-uses filebrowsertypes;
+uses lcltype,frmfilesearcher,filebrowsertypes;

 var
  FileBrowserOptionsFrameID: integer = 2000;
@ -27,6 +27,32 @@ begin
  IDEWindowCreators.ShowForm(FileBrowserCreator.FormName,true);
 end;

+procedure ShowFileSearcher(Sender: TObject);
+
+var
+  Entries : TFileEntryArray;
+
+var
+  C: TFileBrowserController;
+
+begin
+  Entries:=[];
+  With TFileSearcherForm.Create(Application) do
+    try
+      if ShowModal=mrOK then
+        Entries:=GetSelectedItems;
+    finally
+      Free;
+    end;
+  if Length(Entries)>0 then
+    begin
+    C := LazarusIDE.OwningComponent.FindComponent('IDEFileBrowserController') as TFileBrowserController;
+    if Assigned(C) then
+      C.OpenFiles(Entries);
+    end;
+end;
+
+
 procedure CreateFileBrowser(Sender: TObject; aFormName: string; var AForm: TCustomForm; DoDisableAutoSizing: boolean);

 var
@ -48,6 +74,7 @@ begin
    AForm.EnableAutoSizing;
 end;

+
 procedure CreateController;

 var
@ -59,6 +86,8 @@ begin
    begin
    C := TFileBrowserController.Create(LazarusIDE.OwningComponent);
    C.Name:='IDEFileBrowserController';
+    if C.GetResolvedRootDir<>'' then
+      C.IndexRootDir;
    end;
  C.ConfigFrame:=TFileBrowserOptionsFrame;
 end;
@ -68,7 +97,7 @@ procedure Register;
 var
  CmdCatViewMenu: TIDECommandCategory;
  ViewFileBrowserCommand: TIDECommand;
-
+  ViewFileSearcherCommand: TIDECommand;
 begin
  // search shortcut category
  CmdCatViewMenu:=IDECommandList.FindCategoryByName(CommandCategoryViewName);
@ -76,10 +105,17 @@ begin
  ViewFileBrowserCommand:=RegisterIDECommand(CmdCatViewMenu,
    'ViewFileBrowser',SFileBrowserIDEMenuCaption,
    CleanIDEShortCut,nil,@ShowFileBrowser);
+  // register shortcut
+  ViewFileSearcherCommand:=RegisterIDECommand(CmdCatViewMenu,
+    'ViewFileSearcher',SFileSearcherIDEMenuCaption,
+    IDEShortCut(Ord('P'), [ssctrl], VK_UNKNOWN,[]),nil,@ShowFileSearcher);
  // register menu item in View menu
  RegisterIDEMenuCommand(itmViewMainWindows,
    ViewFileBrowserCommand.Name,
    SFileBrowserIDEMenuCaption, nil, nil, ViewFileBrowserCommand);
+  RegisterIDEMenuCommand(itmViewMainWindows,
+    ViewFileSearcherCommand.Name,
+    SFileSearcherIDEMenuCaption, nil, nil, ViewFileSearcherCommand);

  CreateController;

@ -87,10 +123,8 @@ begin
  FileBrowserCreator:=IDEWindowCreators.Add(
    'FileBrowser',
    @CreateFileBrowser,nil,
-    '200','100','400','400'  // default place at left=200, top=100, right=400, bottom=400
-     // you can also define percentage values of screen or relative positions, see wiki
+    '200','100','400','400'
    );
-
  // add IDE options frame
  FileBrowserOptionsFrameID:=RegisterIDEOptionsEditor(GroupEnvironment,TFileBrowserOptionsFrame,
                                              FileBrowserOptionsFrameID)^.Index;