IDE: unified Find in Files dialog resource strings with Find/Replace dialog ones; added missing accelerators, bug #19966

git-svn-id: trunk@31977 -

ide/findinfilesdlg.lfm

@@ -20,8 +20,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 83
+    Height = 70
-    Top = 72
+    Top = 60
     Width = 429
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
@@ -57,8 +57,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 111
+    Height = 93
-    Top = 161
+    Top = 136
     Width = 429
     Anchors = [akTop, akLeft, akRight]
     AutoFill = True
@@ -75,8 +75,8 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 90
+    ClientHeight = 75
-    ClientWidth = 421
+    ClientWidth = 425
     ItemIndex = 1
     Items.Strings = (
       'search all files in project'
@@ -93,15 +93,15 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 129
+    Height = 110
-    Top = 278
+    Top = 235
     Width = 429
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Directory Options'
-    ClientHeight = 108
+    ClientHeight = 92
-    ClientWidth = 421
+    ClientWidth = 425
     Enabled = False
     TabOrder = 5
     object DirectoryLabel: TLabel
@@ -109,11 +109,12 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       AnchorSideTop.Control = DirectoryComboBox
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 18
+      Height = 14
-      Top = 10
+      Top = 9
-      Width = 68
+      Width = 49
       BorderSpacing.Left = 6
       Caption = 'Directory:'
+      FocusControl = DirectoryComboBox
       ParentColor = False
     end
     object FileMaskLabel: TLabel
@@ -121,12 +122,13 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       AnchorSideTop.Control = DirectoryComboBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 18
+      Height = 14
-      Top = 45
+      Top = 39
-      Width = 65
+      Width = 44
       BorderSpacing.Left = 6
       BorderSpacing.Top = 12
       Caption = 'File mask'
+      FocusControl = FileMaskComboBox
       ParentColor = False
     end
     object DirectoryComboBox: TComboBox
@@ -134,15 +136,15 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = DirectoryOptionsGroupBox
       AnchorSideRight.Control = DirectoryBrowse
-      Left = 80
+      Left = 61
-      Height = 27
+      Height = 21
       Top = 6
-      Width = 244
+      Width = 314
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       BorderSpacing.Right = 6
-      ItemHeight = 0
+      ItemHeight = 13
       TabOrder = 0
     end
     object DirectoryBrowse: TBitBtn
@@ -150,10 +152,10 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       AnchorSideTop.Control = DirectoryComboBox
       AnchorSideRight.Control = DirectoryOptionsGroupBox
       AnchorSideRight.Side = asrBottom
-      Left = 330
+      Left = 381
-      Height = 27
+      Height = 23
       Top = 6
-      Width = 85
+      Width = 38
       Anchors = [akTop, akRight]
       AutoSize = True
       BorderSpacing.Right = 6
@@ -170,13 +172,13 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Control = DirectoryComboBox
       AnchorSideRight.Side = asrBottom
-      Left = 77
+      Left = 56
-      Height = 27
+      Height = 21
-      Top = 41
+      Top = 36
-      Width = 247
+      Width = 319
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
-      ItemHeight = 0
+      ItemHeight = 13
       TabOrder = 2
       Text = '*.pas;*.pp;*.inc'
     end
@@ -185,9 +187,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
       AnchorSideTop.Control = FileMaskComboBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 22
+      Height = 17
-      Top = 80
+      Top = 69
-      Width = 180
+      Width = 126
       BorderSpacing.Left = 6
       BorderSpacing.Top = 12
       BorderSpacing.Bottom = 6
@@ -199,13 +201,15 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
   end
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 34
+    Height = 26
-    Top = 360
+    Top = 368
     Width = 429
     OKButton.Name = 'OKButton'
     OKButton.Caption = '&OK'
+    OKButton.OnClick = OKButtonClick
     HelpButton.Name = 'HelpButton'
     HelpButton.Caption = '&Help'
+    HelpButton.OnClick = HelpButtonClick
     CloseButton.Name = 'CloseButton'
     CloseButton.Caption = '&Close'
     CloseButton.Enabled = False
@@ -222,10 +226,10 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 94
+    Left = 68
-    Height = 27
+    Height = 21
-    Top = 39
+    Top = 33
-    Width = 341
+    Width = 367
     Anchors = [akTop, akLeft, akRight]
     AutoComplete = True
     AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
@@ -234,7 +238,7 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     BorderSpacing.Right = 6
     BorderSpacing.Bottom = 6
     Enabled = False
-    ItemHeight = 0
+    ItemHeight = 13
     TabOrder = 2
   end
   object ReplaceCheckBox: TCheckBox
@@ -242,9 +246,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideTop.Control = ReplaceTextComboBox
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 22
+    Height = 17
-    Top = 41
+    Top = 35
-    Width = 82
+    Width = 56
     BorderSpacing.Left = 6
     Caption = 'Replace'
     Enabled = False
@@ -256,9 +260,9 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideTop.Control = TextToFindComboBox
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 18
+    Height = 14
-    Top = 10
+    Top = 9
-    Width = 85
+    Width = 65
     BorderSpacing.Left = 6
     Caption = 'Text To Find:'
     ParentColor = False
@@ -269,17 +273,17 @@ object LazFindInFilesDialog: TLazFindInFilesDialog
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 97
+    Left = 77
-    Height = 27
+    Height = 21
     Top = 6
-    Width = 338
+    Width = 358
     Anchors = [akTop, akLeft, akRight]
     AutoComplete = True
     AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
-    ItemHeight = 0
+    ItemHeight = 13
     TabOrder = 0
   end
   object SelectDirectoryDialog: TSelectDirectoryDialog

ide/findinfilesdlg.pas

@@ -147,13 +147,13 @@ procedure TLazFindInFilesDialog.FormCreate(Sender: TObject);
 begin
   Caption := srkmecFindInFiles;
 
-  TextToFindLabel.Caption := lisFindFileTextToFind;
+  TextToFindLabel.Caption := dlgTextToFind;
-  ReplaceCheckBox.Caption := lisMenuReplace;
+  ReplaceCheckBox.Caption := dlgReplaceWith;
 
   OptionsCheckGroupBox.Caption := dlgFROpts;
-  OptionsCheckGroupBox.Items[0] := lisFindFileCaseSensitive;
+  OptionsCheckGroupBox.Items[0] := dlgCaseSensitive;
-  OptionsCheckGroupBox.Items[1] := lisFindFileWholeWordsOnly;
+  OptionsCheckGroupBox.Items[1] := dlgWholeWordsOnly;
-  OptionsCheckGroupBox.Items[2] := lisFindFileRegularExpressions;
+  OptionsCheckGroupBox.Items[2] := dlgRegularExpressions;
   OptionsCheckGroupBox.Items[3] := lisFindFileMultiLinePattern;
 
   WhereRadioGroup.Caption:=lisFindFileWhere;
@@ -162,15 +162,12 @@ begin
   WhereRadioGroup.Items[2] := lisFindFilesearchInDirectories;
 
   DirectoryOptionsGroupBox.Caption := lisFindFileDirectoryOptions;
-  DirectoryLabel.Caption := lisCodeToolsDefsInsertBehindDirectory;
+  DirectoryLabel.Caption := lisFindFileDirectory;
   FileMaskLabel.Caption := lisFindFileFileMask;
 
   IncludeSubDirsCheckBox.Caption := lisFindFileIncludeSubDirectories;
 
-  ButtonPanel1.OkButton.Caption := lisLazBuildOk;
-  ButtonPanel1.OKButton.OnClick := @OKButtonClick;
   ButtonPanel1.HelpButton.Caption := lisMenuHelp;
-  ButtonPanel1.HelpButton.OnClick := @HelpButtonClick;
   ButtonPanel1.CancelButton.Caption := dlgCancel;
 
   ReplaceCheckBox.Enabled:=true;

ide/findreplacedialog.pp

@@ -138,7 +138,7 @@ begin
   inherited Create(TheOwner);
   Caption:='';
   TextToFindComboBox.Text:='';
-  TextToFindLabel.Caption:=dlgTextToFing;
+  TextToFindLabel.Caption:=dlgTextToFind;
   ReplaceTextComboBox.Text:='';
   ReplaceWithCheckbox.Caption:=dlgReplaceWith;
   EnableAutoCompleteSpeedButton.LoadGlyphFromLazarusResource('menu_stepinto');

ide/lazarusidestrconsts.pas

@@ -2117,7 +2117,7 @@ resourcestring
   lisRunParamsTheHostApplicationIsNotExecutable = 'The host application %s%s%'
     +'s is not executable.';
   dlgTheDirectory = 'The directory "';
-  dlgTextToFing = '&Text to Find';
+  dlgTextToFind = '&Text to Find';
   dlgReplaceWith = '&Replace With';
   dlgFROpts = 'Options';
   lisBFWhenThisFileIsActiveInSourceEditor = 'When this file is active in '
@@ -3503,18 +3503,15 @@ resourcestring
     +'at least a title and a filename.';
     
   // find in files dialog
-  lisFindFileTextToFind = 'Text to find:';
-  lisFindFileCaseSensitive = '&Case sensitive';
-  lisFindFileWholeWordsOnly = '&Whole words only';
-  lisFindFileRegularExpressions = '&Regular expressions';
   lisFindFileMultiLinePattern = '&Multiline pattern';
   lisFindFileWhere = 'Where';
   lisFindFilesearchAllFilesInProject = 'search all files in &project';
   lisFindFilesearchAllOpenFiles = 'search all &open files';
   lisFindFilesearchInDirectories = 'search in &directories';
   lisFindFileDirectoryOptions = 'Directory options';
-  lisFindFileFileMask = 'File mask';
+  lisFindFileDirectory = 'D&irectory';
-  lisFindFileIncludeSubDirectories = 'Include sub directories';
+  lisFindFileFileMask = 'Fi&le mask';
+  lisFindFileIncludeSubDirectories = 'Include &sub directories';
   lisFindFileOnlyTextFiles = 'Only text files';
 
   // package manager