IDE: Improve filters default text in Code Explorer. Issue #23201, patch from Gerard Visent

git-svn-id: trunk@40904 -

ide/codeexplorer.lfm

@@ -3,37 +3,35 @@ object CodeExplorerView: TCodeExplorerView
   Height = 517
   Top = 136
   Width = 220
-  ActiveControl = CodeFilterEdit
   Caption = 'CodeExplorerView'
   ClientHeight = 517
   ClientWidth = 220
   KeyPreview = True
   OnCreate = CodeExplorerViewCREATE
   OnDestroy = CodeExplorerViewDestroy
-  LCLVersion = '0.9.31'
+  LCLVersion = '1.1'
   object MainNotebook: TPageControl
     Left = 0
     Height = 515
     Top = 2
     Width = 220
-    ActivePage = CodePage
+    ActivePage = DirectivesPage
     Align = alClient
     BorderSpacing.Top = 2
-    TabIndex = 0
+    TabIndex = 1
     TabOrder = 0
     OnChange = MainNotebookPageChanged
     object CodePage: TTabSheet
       Caption = 'CodePage'
-      ClientHeight = 488
-      ClientWidth = 216
+      ClientHeight = 485
+      ClientWidth = 212
       object CodeTreeview: TTreeView
         Left = 0
-        Height = 464
+        Height = 461
         Top = 24
-        Width = 216
+        Width = 212
         Align = alClient
         BorderSpacing.Top = 1
-        DefaultItemHeight = 19
         HideSelection = False
         Images = Imagelist1
         PopupMenu = TreePopupmenu
@@ -49,12 +47,12 @@ object CodeExplorerView: TCodeExplorerView
         Left = 0
         Height = 23
         Top = 0
-        Width = 216
+        Width = 212
         Align = alTop
         AutoSize = True
         BevelOuter = bvNone
         ClientHeight = 23
-        ClientWidth = 216
+        ClientWidth = 212
         TabOrder = 0
         object CodeFilterEdit: TEdit
           AnchorSideLeft.Control = CodeTreeviewButtonPanel
@@ -63,9 +61,10 @@ object CodeExplorerView: TCodeExplorerView
           Left = 0
           Height = 23
           Top = 0
-          Width = 147
+          Width = 143
           Anchors = [akTop, akLeft, akRight]
           OnChange = CodeFilterEditChange
+          OnEnter = CodeFilterEditEnter
           OnExit = CodeFilterEditExit
           TabOrder = 0
           Text = 'CodeFilterEdit'
@@ -74,14 +73,13 @@ object CodeExplorerView: TCodeExplorerView
           AnchorSideRight.Control = CodeModeSpeedButton
           AnchorSideBottom.Control = CodeFilterEdit
           AnchorSideBottom.Side = asrBottom
-          Left = 147
+          Left = 143
           Height = 22
           Hint = 'Refresh CodeExplorer'
           Top = 1
           Width = 23
           Anchors = [akTop, akRight, akBottom]
           Flat = True
-          NumGlyphs = 0
           OnClick = CodeRefreshSpeedButtonClick
           ShowHint = True
           ParentShowHint = False
@@ -90,13 +88,12 @@ object CodeExplorerView: TCodeExplorerView
           AnchorSideRight.Control = CodeOptionsSpeedButton
           AnchorSideBottom.Control = CodeRefreshSpeedButton
           AnchorSideBottom.Side = asrBottom
-          Left = 170
+          Left = 166
           Height = 22
           Top = 1
           Width = 23
           Anchors = [akTop, akRight, akBottom]
           Flat = True
-          NumGlyphs = 0
           OnClick = CodeModeSpeedButtonClick
           ShowHint = True
           ParentShowHint = False
@@ -106,14 +103,13 @@ object CodeExplorerView: TCodeExplorerView
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = CodeRefreshSpeedButton
           AnchorSideBottom.Side = asrBottom
-          Left = 193
+          Left = 189
           Height = 22
           Hint = 'Options for CodeExplorer'
           Top = 1
           Width = 23
           Anchors = [akTop, akRight, akBottom]
           Flat = True
-          NumGlyphs = 0
           OnClick = CodeOptionsSpeedButtonClick
           ShowHint = True
           ParentShowHint = False
@@ -122,27 +118,29 @@ object CodeExplorerView: TCodeExplorerView
     end
     object DirectivesPage: TTabSheet
       Caption = 'DirectivesPage'
-      ClientHeight = 488
-      ClientWidth = 216
+      ClientHeight = 485
+      ClientWidth = 212
       object DirTreeviewButtonPanel: TPanel
         Left = 0
         Height = 23
         Top = 0
-        Width = 216
+        Width = 212
         Align = alTop
         AutoSize = True
         BevelOuter = bvNone
         ClientHeight = 23
-        ClientWidth = 216
+        ClientWidth = 212
         TabOrder = 0
         object DirectivesFilterEdit: TEdit
           AnchorSideRight.Control = DirRefreshSpeedButton
           Left = 0
           Height = 23
           Top = 0
-          Width = 170
+          Width = 166
           Anchors = [akTop, akLeft, akRight]
           OnChange = DirectivesFilterEditChange
+          OnEnter = DirectivesFilterEditEnter
+          OnExit = DirectivesFilterEditExit
           TabOrder = 0
           Text = 'DirectivesFilterEdit'
         end
@@ -150,14 +148,13 @@ object CodeExplorerView: TCodeExplorerView
           AnchorSideRight.Control = DirOptionsSpeedButton
           AnchorSideBottom.Control = DirectivesFilterEdit
           AnchorSideBottom.Side = asrBottom
-          Left = 170
+          Left = 166
           Height = 22
           Hint = 'Refresh CodeExplorer'
           Top = 1
           Width = 23
           Anchors = [akTop, akRight, akBottom]
           Flat = True
-          NumGlyphs = 0
           OnClick = CodeRefreshSpeedButtonClick
           ShowHint = True
           ParentShowHint = False
@@ -167,14 +164,13 @@ object CodeExplorerView: TCodeExplorerView
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = DirRefreshSpeedButton
           AnchorSideBottom.Side = asrBottom
-          Left = 193
+          Left = 189
           Height = 22
           Hint = 'Options for CodeExplorer'
           Top = 1
           Width = 23
           Anchors = [akTop, akRight, akBottom]
           Flat = True
-          NumGlyphs = 0
           OnClick = CodeOptionsSpeedButtonClick
           ShowHint = True
           ParentShowHint = False
@@ -184,13 +180,13 @@ object CodeExplorerView: TCodeExplorerView
         AnchorSideTop.Control = DirTreeviewButtonPanel
         AnchorSideTop.Side = asrBottom
         Left = 0
-        Height = 464
+        Height = 461
         Top = 24
-        Width = 216
+        Width = 212
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Top = 1
-        DefaultItemHeight = 19
+        DefaultItemHeight = 18
         PopupMenu = TreePopupmenu
         ReadOnly = True
         TabOrder = 1

ide/codeexplorer.pas

@@ -136,6 +136,7 @@ type
     TreePopupmenu: TPopupMenu;
     procedure CodeExplorerViewCreate(Sender: TObject);
     procedure CodeExplorerViewDestroy(Sender: TObject);
+    procedure CodeFilterEditEnter(Sender: TObject);
     procedure CodeFilterEditExit(Sender: TObject);
     procedure CodeTreeviewDblClick(Sender: TObject);
     procedure CodeTreeviewDeletion(Sender: TObject; Node: TTreeNode);
@@ -143,6 +144,8 @@ type
                                 Shift: TShiftState);
     procedure CodeFilterEditChange(Sender: TObject);
     procedure DirectivesFilterEditChange(Sender: TObject);
+    procedure DirectivesFilterEditEnter(Sender: TObject);
+    procedure DirectivesFilterEditExit(Sender: TObject);
     procedure DirectivesTreeViewDblClick(Sender: TObject);
     procedure DirectivesTreeViewDeletion(Sender: TObject; Node: TTreeNode);
     procedure DirectivesTreeViewKeyUp(Sender: TObject; var Key: Word;
@@ -521,6 +524,14 @@ begin
     CodeExplorerView:=nil;
 end;
 
+procedure TCodeExplorerView.CodeFilterEditEnter(Sender: TObject);
+begin
+  if CodeFilterEdit.Text = lisCEFilter then
+    CodeFilterEdit.Text:=''
+  else
+    CodeFilterEdit.SelectAll;
+end;
+
 procedure TCodeExplorerView.CodeFilterEditExit(Sender: TObject);
 begin
   if CodeFilterEdit.Text='' then
@@ -558,6 +569,20 @@ begin
   DirectivesFilterChanged;
 end;
 
+procedure TCodeExplorerView.DirectivesFilterEditEnter(Sender: TObject);
+begin
+  if DirectivesFilterEdit.Text = lisCEFilter then
+    DirectivesFilterEdit.Text:=''
+  else
+    DirectivesFilterEdit.SelectAll;
+end;
+
+procedure TCodeExplorerView.DirectivesFilterEditExit(Sender: TObject);
+begin
+  if DirectivesFilterEdit.Text='' then
+    DirectivesFilterEdit.Text:=lisCEFilter;
+end;
+
 procedure TCodeExplorerView.DirectivesTreeViewDblClick(Sender: TObject);
 begin
   JumpToSelection;
@@ -1860,7 +1885,7 @@ var
   ANode: TTreeNode;
   TheFilter: String;
 begin
-  TheFilter:=DirectivesFilterEdit.Text;
+  TheFilter:=GetDirectivesFilter;
   FLastDirectivesFilter:=TheFilter;
   DirectivesTreeView.BeginUpdate;
   DirectivesTreeView.Options:=DirectivesTreeView.Options+[tvoAllowMultiselect];