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

IDE: Add a filter clear button in Code Explorer. Merge request !74 by Sergey Larin.

Browse Source
This commit is contained in:
Juha 2022-02-24 12:39:00 +02:00
parent b0d263f11d
commit cd0b898131
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ide/codeexplorer.lfm
View File

@ -55,7 +55,7 @@ object CodeExplorerView: TCodeExplorerView
ClientHeight = 24
ClientWidth = 218
TabOrder = 0
object CodeFilterEdit: TEdit
object CodeFilterEdit: TEditButton
AnchorSideLeft.Control = CodeTreeviewButtonPanel
AnchorSideTop.Control = CodeTreeviewButtonPanel
AnchorSideRight.Control = CodeRefreshSpeedButton
@ -64,8 +64,15 @@ object CodeExplorerView: TCodeExplorerView
Top = 0
Width = 149
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 2
ButtonWidth = 23
MaxLength = 0
NumGlyphs = 1
OnButtonClick = FilterEditButtonClick
OnChange = CodeFilterEditChange
OnEnter = FilterEditEnter
PasswordChar = #0
Spacing = 2
TabOrder = 0
Text = 'CodeFilterEdit'
end
@ -131,15 +138,22 @@ object CodeExplorerView: TCodeExplorerView
ClientHeight = 24
ClientWidth = 218
TabOrder = 0
object DirectivesFilterEdit: TEdit
object DirectivesFilterEdit: TEditButton
AnchorSideRight.Control = DirRefreshSpeedButton
Left = 0
Height = 24
Top = 0
Width = 172
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Right = 2
ButtonWidth = 23
MaxLength = 0
NumGlyphs = 1
OnButtonClick = FilterEditButtonClick
OnChange = DirectivesFilterEditChange
OnEnter = FilterEditEnter
PasswordChar = #0
Spacing = 2
TabOrder = 0
Text = 'DirectivesFilterEdit'
end

25
ide/codeexplorer.pas
View File

@ -43,7 +43,7 @@ uses
// LazUtils
LazStringUtils, LazLoggerBase,
// LCL
LCLProc, LCLType, Forms, Controls, Dialogs, Buttons, ComCtrls, Menus, StdCtrls, ExtCtrls,
LCLProc, LCLType, Forms, Controls, Dialogs, Buttons, ComCtrls, Menus, ExtCtrls, EditBtn,
// CodeTools
FileProcs, BasicCodeTools, CustomCodeTool, CodeToolManager, CodeAtom,
CodeCache, CodeTree, KeywordFuncLists, FindDeclarationTool, DirectivesTree,
@ -113,10 +113,10 @@ type
{ TCodeExplorerView }
TCodeExplorerView = class(TForm)
CodeFilterEdit: TEdit;
CodeFilterEdit: TEditButton;
CodePage: TTabSheet;
CodeTreeview: TTreeView;
DirectivesFilterEdit: TEdit;
DirectivesFilterEdit: TEditButton;
DirectivesPage: TTabSheet;
DirectivesTreeView: TTreeView;
IdleTimer1: TIdleTimer;
@ -137,6 +137,7 @@ type
{%H-}Shift: TShiftState; X, Y: Integer);
procedure DirectivesFilterEditChange(Sender: TObject);
procedure DirRefreshSpeedButtonClick(Sender: TObject);
procedure FilterEditButtonClick(Sender: TObject);
procedure FilterEditEnter(Sender: TObject);
procedure FormActivate(Sender: TObject);
procedure IdleTimer1Timer(Sender: TObject);
@ -486,6 +487,8 @@ begin
DirOptionsSpeedButton.Hint:=lisOptions;
CodeFilterEdit.TextHint:=lisCEFilter;
DirectivesFilterEdit.TextHint:=lisCEFilter;
CodeFilterEdit.Button.Enabled:=false;
DirectivesFilterEdit.Button.Enabled:=false;
AssignAllImages;
// assign the root TMenuItem to the registered menu root.
@ -543,9 +546,15 @@ begin
RefreshDirectives(true);
end;
procedure TCodeExplorerView.FilterEditButtonClick(Sender: TObject);
begin
(Sender as TEditButton).Text:='';
IdleTimer1Timer(nil); // immediately reset filter
end;
procedure TCodeExplorerView.FilterEditEnter(Sender: TObject);
begin
(Sender as TEdit).SelectAll;
(Sender as TEditButton).SelectAll;
end;
procedure TCodeExplorerView.FormActivate(Sender: TObject);
@ -725,6 +734,9 @@ begin
CheckOnIdle;
end;
type
TSpeedButtonFriend = class(TSpeedButton);
procedure TCodeExplorerView.AssignAllImages;
begin
IDEImages.AssignImage(CodeRefreshSpeedButton, 'laz_refresh');
@ -758,6 +770,9 @@ begin
// sections
ImgIDSection := IDEImages.GetImageIndex('ce_section');
ImgIDHint := IDEImages.GetImageIndex('state_hint');
TSpeedButtonFriend(CodeFilterEdit.Button).ButtonGlyph.LCLGlyphName := ResBtnListFilter;
TSpeedButtonFriend(DirectivesFilterEdit.Button).ButtonGlyph.LCLGlyphName := ResBtnListFilter;
end;
function TCodeExplorerView.GetCodeNodeDescription(ACodeTool: TCodeTool;
@ -2587,6 +2602,7 @@ var
TheFilter: String;
begin
TheFilter:=GetCodeFilter;
CodeFilterEdit.Button.Enabled:=TheFilter<>'';
if FLastCodeFilter=TheFilter then exit;
if (FUpdateCount>0) or (CurrentPage<>cepCode) then begin
Include(FFlags,cevCodeRefreshNeeded);
@ -2606,6 +2622,7 @@ var
TheFilter: String;
begin
TheFilter:=DirectivesFilterEdit.Text;
DirectivesFilterEdit.Button.Enabled:=TheFilter<>'';
if FLastDirectivesFilter=TheFilter then exit;
if (FUpdateCount>0) or (CurrentPage<>cepDirectives) then begin
Include(FFlags,cevDirectivesRefreshNeeded);