* External Tools Options Dialog lozalization, LFL conversion and improvement patch by Maxim Ganetsky

git-svn-id: trunk@13703 -

.gitattributes

@@ -1945,6 +1945,8 @@ ide/extractprocdlg.pas svneol=native#text/pascal
 ide/exttooldialog.lfm svneol=native#text/plain
 ide/exttooldialog.lrs svneol=native#text/plain
 ide/exttooldialog.pas svneol=native#text/pascal
+ide/exttooleditdlg.lfm svneol=native#text/pascal
+ide/exttooleditdlg.lrs svneol=native#text/pascal
 ide/exttooleditdlg.pas svneol=native#text/pascal
 ide/filereferencelist.pas svneol=native#text/pascal
 ide/findinfilesdlg.lfm svneol=native#text/plain

ide/exttooleditdlg.lfm

@@ -0,0 +1,377 @@
+object ExternalToolOptionDlg: TExternalToolOptionDlg
+  Left = 670
+  Height = 450
+  Top = 274
+  Width = 560
+  HorzScrollBar.Page = 559
+  VertScrollBar.Page = 449
+  Caption = 'ExternalToolOptionDlg'
+  ClientHeight = 450
+  ClientWidth = 560
+  Constraints.MinHeight = 350
+  Constraints.MinWidth = 350
+  KeyPreview = True
+  OnCreate = FormCreate
+  OnDestroy = FormDestroy
+  OnKeyUp = FormKeyUp
+  Position = poScreenCenter
+  object TitleLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = TitleEdit
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 10
+    Width = 46
+    BorderSpacing.Left = 6
+    Caption = 'TitleLabel'
+    ParentColor = False
+  end
+  object FilenameLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = FilenameEdit
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 39
+    Width = 68
+    BorderSpacing.Left = 6
+    Caption = 'FilenameLabel'
+    ParentColor = False
+  end
+  object ParametersLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ParametersEdit
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 68
+    Width = 81
+    BorderSpacing.Left = 6
+    Caption = 'ParametersLabel'
+    ParentColor = False
+  end
+  object WorkingDirLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = WorkingDirEdit
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 97
+    Width = 78
+    BorderSpacing.Left = 6
+    Caption = 'WorkingDirLabel'
+    ParentColor = False
+  end
+  object TitleEdit: TEdit
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 128
+    Height = 23
+    Top = 6
+    Width = 426
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Around = 6
+    TabOrder = 0
+    Text = 'TitleEdit'
+  end
+  object FilenameEdit: TEdit
+    AnchorSideLeft.Control = TitleEdit
+    AnchorSideTop.Control = TitleEdit
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = OpenButton
+    Left = 128
+    Height = 23
+    Top = 35
+    Width = 385
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    TabOrder = 1
+    Text = 'FilenameEdit'
+  end
+  object OpenButton: TButton
+    AnchorSideTop.Control = FilenameEdit
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = FilenameEdit
+    AnchorSideBottom.Side = asrBottom
+    Left = 519
+    Height = 23
+    Top = 35
+    Width = 35
+    Anchors = [akTop, akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Right = 6
+    Caption = '...'
+    OnClick = OpenButtonClick
+    ParentShowHint = False
+    ShowHint = True
+    TabOrder = 2
+  end
+  object ParametersEdit: TEdit
+    AnchorSideLeft.Control = TitleEdit
+    AnchorSideTop.Control = FilenameEdit
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 128
+    Height = 23
+    Top = 64
+    Width = 426
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    TabOrder = 3
+    Text = 'ParametersEdit'
+  end
+  object WorkingDirEdit: TEdit
+    AnchorSideLeft.Control = TitleEdit
+    AnchorSideTop.Control = ParametersEdit
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 128
+    Height = 23
+    Top = 93
+    Width = 426
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    TabOrder = 4
+    Text = 'WorkingDirEdit'
+  end
+  object OptionsGroupBox: TGroupBox
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = WorkingDirEdit
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 70
+    Top = 122
+    Width = 548
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Caption = 'OptionsGroupBox'
+    ClientHeight = 52
+    ClientWidth = 544
+    TabOrder = 5
+    object OptionScanOutputForFPCMessagesCheckBox: TCheckBox
+      AnchorSideLeft.Control = OptionsGroupBox
+      AnchorSideTop.Control = OptionsGroupBox
+      Left = 6
+      Height = 19
+      Top = 2
+      Width = 246
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 2
+      Caption = 'OptionScanOutputForFPCMessagesCheckBox'
+      TabOrder = 0
+    end
+    object OptionScanOutputForMakeMessagesCheckBox: TCheckBox
+      AnchorSideLeft.Control = OptionScanOutputForFPCMessagesCheckBox
+      AnchorSideTop.Control = OptionScanOutputForFPCMessagesCheckBox
+      AnchorSideTop.Side = asrBottom
+      AnchorSideBottom.Control = OptionsGroupBox
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
+      Height = 19
+      Top = 27
+      Width = 253
+      Anchors = [akTop, akLeft, akBottom]
+      BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
+      Caption = 'OptionScanOutputForMakeMessagesCheckBox'
+      TabOrder = 1
+    end
+  end
+  object KeyGroupBox: TGroupBox
+    AnchorSideLeft.Control = OptionsGroupBox
+    AnchorSideTop.Control = OptionsGroupBox
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = OptionsGroupBox
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 45
+    Top = 198
+    Width = 548
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Top = 6
+    Caption = 'KeyGroupBox'
+    ClientHeight = 27
+    ClientWidth = 544
+    TabOrder = 6
+    object KeyCtrlCheckBox: TCheckBox
+      AnchorSideLeft.Control = KeyGroupBox
+      AnchorSideTop.Control = KeyGroupBox
+      AnchorSideBottom.Control = KeyGroupBox
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
+      Height = 19
+      Top = 2
+      Width = 108
+      Anchors = [akTop, akLeft, akBottom]
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 2
+      BorderSpacing.Bottom = 6
+      Caption = 'KeyCtrlCheckBox'
+      TabOrder = 0
+    end
+    object KeyAltCheckBox: TCheckBox
+      AnchorSideLeft.Control = KeyCtrlCheckBox
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = KeyCtrlCheckBox
+      Left = 120
+      Height = 19
+      Top = 2
+      Width = 105
+      BorderSpacing.Left = 6
+      Caption = 'KeyAltCheckBox'
+      TabOrder = 1
+    end
+    object KeyShiftCheckBox: TCheckBox
+      AnchorSideLeft.Control = KeyAltCheckBox
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = KeyCtrlCheckBox
+      Left = 231
+      Height = 19
+      Top = 2
+      Width = 114
+      BorderSpacing.Left = 6
+      Caption = 'KeyShiftCheckBox'
+      TabOrder = 2
+    end
+    object KeyComboBox: TComboBox
+      AnchorSideLeft.Control = KeyShiftCheckBox
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = KeyCtrlCheckBox
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = KeyGrabButton
+      Left = 351
+      Height = 21
+      Top = 1
+      Width = 83
+      Anchors = [akTop, akLeft, akRight]
+      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+      BorderSpacing.Left = 6
+      BorderSpacing.Right = 6
+      ItemHeight = 13
+      TabOrder = 3
+      Text = 'KeyComboBox'
+    end
+    object KeyGrabButton: TButton
+      AnchorSideTop.Control = KeyCtrlCheckBox
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Control = KeyGroupBox
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 440
+      Height = 23
+      Width = 98
+      Anchors = [akRight]
+      AutoSize = True
+      BorderSpacing.Left = 6
+      BorderSpacing.Right = 6
+      Caption = 'KeyGrabButton'
+      OnClick = KeyGrabButtonClick
+      TabOrder = 4
+    end
+  end
+  object MacrosGroupbox: TGroupBox
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = KeyGroupBox
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = OKButton
+    Left = 6
+    Height = 163
+    Top = 249
+    Width = 548
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.Around = 6
+    Caption = 'MacrosGroupbox'
+    ClientHeight = 145
+    ClientWidth = 544
+    TabOrder = 7
+    object MacrosListbox: TListBox
+      AnchorSideLeft.Control = MacrosGroupbox
+      AnchorSideTop.Control = MacrosInsertButton
+      AnchorSideRight.Control = MacrosInsertButton
+      AnchorSideBottom.Control = MacrosGroupbox
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
+      Height = 137
+      Top = 2
+      Width = 408
+      Anchors = [akTop, akLeft, akRight, akBottom]
+      BorderSpacing.Left = 6
+      BorderSpacing.Right = 6
+      BorderSpacing.Bottom = 6
+      OnClick = MacrosListboxClick
+      TabOrder = 0
+    end
+    object MacrosInsertButton: TButton
+      AnchorSideTop.Control = MacrosGroupbox
+      AnchorSideRight.Control = MacrosGroupbox
+      AnchorSideRight.Side = asrBottom
+      Left = 420
+      Height = 23
+      Top = 2
+      Width = 118
+      Anchors = [akTop, akRight]
+      AutoSize = True
+      BorderSpacing.Top = 2
+      BorderSpacing.Right = 6
+      Caption = 'MacrosInsertButton'
+      Enabled = False
+      OnClick = MacrosInsertButtonClick
+      TabOrder = 1
+    end
+  end
+  object OKButton: TBitBtn
+    AnchorSideRight.Control = CancelButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 400
+    Height = 26
+    Top = 418
+    Width = 73
+    Anchors = [akRight, akBottom]
+    BorderSpacing.Around = 6
+    Caption = '&ÎÊ'
+    Default = True
+    Kind = bkOK
+    ModalResult = 1
+    NumGlyphs = 0
+    OnClick = OKButtonClick
+    TabOrder = 8
+  end
+  object CancelButton: TBitBtn
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 479
+    Height = 26
+    Top = 418
+    Width = 75
+    Anchors = [akRight, akBottom]
+    BorderSpacing.Around = 6
+    Cancel = True
+    Caption = 'Îòìåíà'
+    Kind = bkCancel
+    ModalResult = 2
+    NumGlyphs = 0
+    TabOrder = 9
+  end
+  object OpenDialog: TOpenDialog
+    Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail]
+    left = 88
+    top = 32
+  end
+end

ide/exttooleditdlg.lrs

@@ -0,0 +1,139 @@
+{ Ýòî - ôàéë ðåñóðñîâ, àâòîìàòè÷åñêè ñîçäàííûé lazarus }
+
+LazarusResources.Add('TExternalToolOptionDlg','FORMDATA',[
+  'TPF0'#22'TExternalToolOptionDlg'#21'ExternalToolOptionDlg'#4'Left'#3#158#2#6
+  +'Height'#3#194#1#3'Top'#3#18#1#5'Width'#3'0'#2#18'HorzScrollBar.Page'#3'/'#2
+  +#18'VertScrollBar.Page'#3#193#1#7'Caption'#6#21'ExternalToolOptionDlg'#12'Cl'
+  +'ientHeight'#3#194#1#11'ClientWidth'#3'0'#2#21'Constraints.MinHeight'#3'^'#1
+  +#20'Constraints.MinWidth'#3'^'#1#10'KeyPreview'#9#8'OnCreate'#7#10'FormCreat'
+  +'e'#9'OnDestroy'#7#11'FormDestroy'#7'OnKeyUp'#7#9'FormKeyUp'#8'Position'#7#14
+  +'poScreenCenter'#0#6'TLabel'#10'TitleLabel'#22'AnchorSideLeft.Control'#7#5'O'
+  +'wner'#21'AnchorSideTop.Control'#7#9'TitleEdit'#18'AnchorSideTop.Side'#7#9'a'
+  +'srCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#10#5'Width'#2'.'#18'BorderSpa'
+  +'cing.Left'#2#6#7'Caption'#6#10'TitleLabel'#11'ParentColor'#8#0#0#6'TLabel'
+  +#13'FilenameLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+  +'ntrol'#7#12'FilenameEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6
+  +#6'Height'#2#14#3'Top'#2''''#5'Width'#2'D'#18'BorderSpacing.Left'#2#6#7'Capt'
+  +'ion'#6#13'FilenameLabel'#11'ParentColor'#8#0#0#6'TLabel'#15'ParametersLabel'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'Parame'
+  +'tersEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3
+  +'Top'#2'D'#5'Width'#2'Q'#18'BorderSpacing.Left'#2#6#7'Caption'#6#15'Paramete'
+  +'rsLabel'#11'ParentColor'#8#0#0#6'TLabel'#15'WorkingDirLabel'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'WorkingDirEdit'#18'A'
+  +'nchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'a'#5
+  +'Width'#2'N'#18'BorderSpacing.Left'#2#6#7'Caption'#6#15'WorkingDirLabel'#11
+  +'ParentColor'#8#0#0#5'TEdit'#9'TitleEdit'#21'AnchorSideTop.Control'#7#5'Owne'
+  +'r'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#3#128#0#6'Height'#2#23#3'Top'#2#6#5'Width'#3#170#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'
+  +#2#0#4'Text'#6#9'TitleEdit'#0#0#5'TEdit'#12'FilenameEdit'#22'AnchorSideLeft.'
+  +'Control'#7#9'TitleEdit'#21'AnchorSideTop.Control'#7#9'TitleEdit'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#10'OpenButton'#4
+  +'Left'#3#128#0#6'Height'#2#23#3'Top'#2'#'#5'Width'#3#129#1#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Rig'
+  +'ht'#2#6#8'TabOrder'#2#1#4'Text'#6#12'FilenameEdit'#0#0#7'TButton'#10'OpenBu'
+  +'tton'#21'AnchorSideTop.Control'#7#12'FilenameEdit'#23'AnchorSideRight.Contr'
+  +'ol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.'
+  +'Control'#7#12'FilenameEdit'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +#3#7#2#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'#'#7'Anchors'#11#5'akTop'#7'akR'
+  +'ight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#3
+  +'...'#7'OnClick'#7#15'OpenButtonClick'#14'ParentShowHint'#8#8'ShowHint'#9#8
+  +'TabOrder'#2#2#0#0#5'TEdit'#14'ParametersEdit'#22'AnchorSideLeft.Control'#7#9
+  +'TitleEdit'#21'AnchorSideTop.Control'#7#12'FilenameEdit'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#4'Left'#3#128#0#6'Height'#2#23#3'Top'#2'@'#5'Width'#3
+  +#170#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2
+  +#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#3#4'Text'#6#14'ParametersEdit'#0
+  +#0#5'TEdit'#14'WorkingDirEdit'#22'AnchorSideLeft.Control'#7#9'TitleEdit'#21
+  +'AnchorSideTop.Control'#7#14'ParametersEdit'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3#128#0#6'Height'#2#23#3'Top'#2']'#5'Width'#3#170#1#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'Bord'
+  +'erSpacing.Right'#2#6#8'TabOrder'#2#4#4'Text'#6#14'WorkingDirEdit'#0#0#9'TGr'
+  +'oupBox'#15'OptionsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor'
+  +'SideTop.Control'#7#14'WorkingDirEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#4'Left'#2#6#6'Height'#2'F'#3'Top'#2'z'#5'Width'#3'$'#2#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#15'OptionsGroupBox'#12'ClientHeight'#2'4'#11'ClientWidth'#3' '#2
+  +#8'TabOrder'#2#5#0#9'TCheckBox&OptionScanOutputForFPCMessagesCheckBox'#22'An'
+  +'chorSideLeft.Control'#7#15'OptionsGroupBox'#21'AnchorSideTop.Control'#7#15
+  +'OptionsGroupBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#2#5'Width'#3#246#0#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#7'Caption'#6'&OptionScanO'
+  +'utputForFPCMessagesCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox''OptionScanOut'
+  +'putForMakeMessagesCheckBox'#22'AnchorSideLeft.Control'#7'&OptionScanOutputF'
+  +'orFPCMessagesCheckBox'#21'AnchorSideTop.Control'#7'&OptionScanOutputForFPCM'
+  +'essagesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.'
+  +'Control'#7#15'OptionsGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L'
+  ,'eft'#2#6#6'Height'#2#19#3'Top'#2#27#5'Width'#3#253#0#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2
+  +#6#7'Caption'#6'''OptionScanOutputForMakeMessagesCheckBox'#8'TabOrder'#2#1#0
+  +#0#0#9'TGroupBox'#11'KeyGroupBox'#22'AnchorSideLeft.Control'#7#15'OptionsGro'
+  +'upBox'#21'AnchorSideTop.Control'#7#15'OptionsGroupBox'#18'AnchorSideTop.Sid'
+  +'e'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#15'OptionsGroupBox'#20'Anch'
+  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'-'#3'Top'#3#198#0#5
+  +'Width'#3'$'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17
+  +'BorderSpacing.Top'#2#6#7'Caption'#6#11'KeyGroupBox'#12'ClientHeight'#2#27#11
+  +'ClientWidth'#3' '#2#8'TabOrder'#2#6#0#9'TCheckBox'#15'KeyCtrlCheckBox'#22'A'
+  +'nchorSideLeft.Control'#7#11'KeyGroupBox'#21'AnchorSideTop.Control'#7#11'Key'
+  +'GroupBox'#24'AnchorSideBottom.Control'#7#11'KeyGroupBox'#21'AnchorSideBotto'
+  +'m.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#2#5'Width'#2'l'#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17
+  +'BorderSpacing.Top'#2#2#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#15'KeyCtrl'
+  +'CheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#14'KeyAltCheckBox'#22'AnchorSide'
+  +'Left.Control'#7#15'KeyCtrlCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#15'KeyCtrlCheckBox'#4'Left'#2'x'#6'Height'#2#19
+  +#3'Top'#2#2#5'Width'#2'i'#18'BorderSpacing.Left'#2#6#7'Caption'#6#14'KeyAltC'
+  +'heckBox'#8'TabOrder'#2#1#0#0#9'TCheckBox'#16'KeyShiftCheckBox'#22'AnchorSid'
+  +'eLeft.Control'#7#14'KeyAltCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#15'KeyCtrlCheckBox'#4'Left'#3#231#0#6'Height'#2
+  +#19#3'Top'#2#2#5'Width'#2'r'#18'BorderSpacing.Left'#2#6#7'Caption'#6#16'KeyS'
+  +'hiftCheckBox'#8'TabOrder'#2#2#0#0#9'TComboBox'#11'KeyComboBox'#22'AnchorSid'
+  +'eLeft.Control'#7#16'KeyShiftCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#15'KeyCtrlCheckBox'#18'AnchorSideTop.Side'#7#9
+  +'asrCenter'#23'AnchorSideRight.Control'#7#13'KeyGrabButton'#4'Left'#3'_'#1#6
+  +'Height'#2#21#3'Top'#2#1#5'Width'#2'S'#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'Right'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchA'
+  +'scending'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#10'ItemH'
+  +'eight'#2#13#8'TabOrder'#2#3#4'Text'#6#11'KeyComboBox'#0#0#7'TButton'#13'Key'
+  +'GrabButton'#21'AnchorSideTop.Control'#7#15'KeyCtrlCheckBox'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'KeyGroupBox'#20'Anc'
+  +'horSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#184#1#6'Height'#2#23#5'Width'#2'b'#7'Anchors'#11#7'akRight'#0#8'Aut'
+  +'oSize'#9#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6
+  +#13'KeyGrabButton'#7'OnClick'#7#18'KeyGrabButtonClick'#8'TabOrder'#2#4#0#0#0
+  +#9'TGroupBox'#14'MacrosGroupbox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'An'
+  +'chorSideTop.Control'#7#11'KeyGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'om'#24'AnchorSideBottom.Control'#7#8'OKButton'#4'Left'#2#6#6'Height'#3#163#0
+  +#3'Top'#3#249#0#5'Width'#3'$'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'MacrosGroupbox'#12
+  +'ClientHeight'#3#145#0#11'ClientWidth'#3' '#2#8'TabOrder'#2#7#0#8'TListBox'
+  +#13'MacrosListbox'#22'AnchorSideLeft.Control'#7#14'MacrosGroupbox'#21'Anchor'
+  +'SideTop.Control'#7#18'MacrosInsertButton'#23'AnchorSideRight.Control'#7#18
+  +'MacrosInsertButton'#24'AnchorSideBottom.Control'#7#14'MacrosGroupbox'#21'An'
+  +'chorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#137#0#3'Top'#2#2
+  +#5'Width'#3#152#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bot'
+  +'tom'#2#6#7'OnClick'#7#18'MacrosListboxClick'#8'TabOrder'#2#0#0#0#7'TButton'
+  +#18'MacrosInsertButton'#21'AnchorSideTop.Control'#7#14'MacrosGroupbox'#23'An'
+  +'chorSideRight.Control'#7#14'MacrosGroupbox'#20'AnchorSideRight.Side'#7#9'as'
+  +'rBottom'#4'Left'#3#164#1#6'Height'#2#23#3'Top'#2#2#5'Width'#2'v'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#2#19'BorderS'
+  +'pacing.Right'#2#6#7'Caption'#6#18'MacrosInsertButton'#7'Enabled'#8#7'OnClic'
+  +'k'#7#23'MacrosInsertButtonClick'#8'TabOrder'#2#1#0#0#0#7'TBitBtn'#8'OKButto'
+  +'n'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Contr'
+  +'ol'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#144#1#6'H'
+  +'eight'#2#26#3'Top'#3#162#1#5'Width'#2'I'#7'Anchors'#11#7'akRight'#8'akBotto'
+  +'m'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&'#206#202#7'Default'#9#4
+  +'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OKButt'
+  +'onClick'#8'TabOrder'#2#8#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight'
+  +'.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideB'
+  ,'ottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#223#1#6'Height'#2#26#3'Top'#3#162#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6#206#242
+  +#236#229#237#224#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8
+  +'TabOrder'#2#9#0#0#11'TOpenDialog'#10'OpenDialog'#7'Options'#11#15'ofPathMus'
+  +'tExist'#15'ofFileMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'#2
+  +'X'#3'top'#2' '#0#0#0
+]);

ide/exttooleditdlg.pas

@@ -65,13 +65,16 @@ type
   {
     the editor dialog for a single external tool
   }
+
+  { TExternalToolOptionDlg }
+
   TExternalToolOptionDlg = class(TForm)
     TitleLabel: TLabel;
     TitleEdit: TEdit;
     FilenameLabel: TLabel;
+    FilenameEdit: TEdit;
     OpenDialog: TOpenDialog;
     OpenButton:TButton;
-    FilenameEdit: TEdit;
     ParametersLabel: TLabel;
     ParametersEdit: TEdit;
     WorkingDirLabel: TLabel;
@@ -88,16 +91,15 @@ type
     MacrosGroupbox: TGroupbox;
     MacrosListbox: TListbox;
     MacrosInsertButton: TButton;
-    OkButton: TButton;
+    OKButton: TBitBtn;
-    CancelButton: TButton;
+    CancelButton: TBitBtn;
-    procedure CancelButtonClick(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
-    procedure ExternalToolOptionDlgResize(Sender: TObject);
+    procedure FormDestroy(Sender: TObject);
-    procedure MacrosGroupboxResize(Sender: TObject);
-    procedure OkButtonClick(Sender: TObject);
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift:TShiftState);
     procedure KeyGrabButtonClick(Sender: TObject);
     procedure MacrosInsertButtonClick(Sender: TObject);
     procedure MacrosListboxClick(Sender: TObject);
+    procedure OKButtonClick(Sender: TObject);
     procedure OpenButtonClick(sender : TOBject);
   private
     fOptions: TExternalToolOptions;
@@ -112,8 +114,6 @@ type
     procedure SetOptions(TheOptions: TExternalToolOptions);
     procedure SetTransferMacros(TransferMacroList: TTransferMacroList);
   public
-    constructor Create(AnOwner: TComponent); override;
-    destructor Destroy; override;
     property Options: TExternalToolOptions read fOptions write SetOptions;
     property MacroList: TTransferMacroList
            read fTransferMacros write SetTransferMacros;
@@ -123,10 +123,8 @@ type
 function ShowExtToolOptionDlg(TransferMacroList: TTransferMacroList;
   ExternalToolOptions: TExternalToolOptions):TModalResult;
   
-
 implementation
 
-
 function ShowExtToolOptionDlg(TransferMacroList: TTransferMacroList;
   ExternalToolOptions: TExternalToolOptions):TModalResult;
 var ExternalToolOptionDlg: TExternalToolOptionDlg;
@@ -147,281 +145,6 @@ end;
 
 { TExternalToolOptionDlg }
 
-constructor TExternalToolOptionDlg.Create(AnOwner: TComponent);
-var
-  i: word;
-  s: string;
-begin
-  inherited Create(AnOwner);
-
-  Name:='ExternalToolOptionDlg';
-  
-  GrabbingKey:=0;
-  if LazarusResources.Find(ClassName)=nil then begin
-    Width:=560;
-    Height:=450;
-    Caption:=lisEdtExtToolEditTool;
-    Position:=poScreenCenter;
-
-    TitleLabel:=TLabel.Create(Self);
-    with TitleLabel do begin
-      Name:='TitleLabel';
-      Parent:=Self;
-      SetBounds(5,5,110,22);
-      Caption:=dlgPOTitle;
-    end;
-    
-    TitleEdit:=TEdit.Create(Self);
-    with TitleEdit do begin
-      Name:='TitleEdit';
-      Parent:=Self;
-      Left:=TitleLabel.Left+TitleLabel.Width+5;
-      Top:=TitleLabel.Top+2;
-      Width:=Self.ClientWidth-Left-10;
-      Height:=25;
-    end;
-    
-    FilenameLabel:=TLabel.Create(Self);
-    with FilenameLabel do begin
-      Name:='FilenameLabel';
-      Parent:=Self;
-      SetBounds(TitleLabel.Left,TitleLabel.Top+TitleLabel.Height+10,
-        TitleLabel.Width,TitleLabel.Height);
-      Caption:=lisEdtExtToolProgramfilename;
-    end;
-    
-    FilenameEdit:=TEdit.Create(Self);
-    with FilenameEdit do begin
-      Name:='FilenameEdit';
-      Parent:=Self;
-      SetBounds(TitleEdit.Left,FilenameLabel.Top+2,TitleEdit.Width-TitleEdit.Height-5,
-        TitleEdit.Height);
-    end;
-    
-    OpenButton:=TButton.Create(Self);
-    with OpenButton do
-         begin
-           Name     := 'OpenButton';
-           Caption  := '...';
-           ShowHint := True;
-           Hint     := 'Click here to browse the file';
-           Parent   := Self;
-           SetBounds(FilenameEdit.Left+FilenameEdit.Width+5,
-                     FilenameLabel.Top+2,TitleEdit.Height,
-                     TitleEdit.Height);
-           OnClick := @OpenButtonClick;
-         end;
-    
-    OpenDialog:=TOpenDialog.Create(Self);
-    with OpenDialog do
-         begin
-           Title   := 'Select the file';
-           Filter  := 'Programs (*.exe)|*.exe|All Files (*.*)|*.*';
-           Options := [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail];
-         End;
-    
-    ParametersLabel:=TLabel.Create(Self);
-    with ParametersLabel do begin
-      Name:='ParametersLabel';
-      Parent:=Self;
-      SetBounds(FilenameLabel.Left,FilenameLabel.Top+FilenameLabel.Height+10,
-        FilenameLabel.Width,FilenameLabel.Height);
-      Caption:=lisEdtExtToolParameters;
-    end;
-    
-    ParametersEdit:=TEdit.Create(Self);
-    with ParametersEdit do begin
-      Name:='ParametersEdit';
-      Parent:=Self;
-      SetBounds(FilenameEdit.Left,ParametersLabel.Top+2,TitleEdit.Width,
-        FilenameEdit.Height);
-    end;
-    
-    WorkingDirLabel:=TLabel.Create(Self);
-    with WorkingDirLabel do begin
-      Name:='WorkingDirLabel';
-      Parent:=Self;
-      SetBounds(ParametersLabel.Left,
-        ParametersLabel.Top+ParametersLabel.Height+10,ParametersLabel.Width,
-        ParametersLabel.Height);
-      Caption:=lisEdtExtToolWorkingDirectory;
-    end;
-    
-    WorkingDirEdit:=TEdit.Create(Self);
-    with WorkingDirEdit do begin
-      Name:='WorkingDirEdit';
-      Parent:=Self;
-      SetBounds(ParametersEdit.Left,WorkingDirLabel.Top+2,ParametersEdit.Width,
-        ParametersEdit.Height);
-    end;
-    
-    OptionsGroupBox:=TGroupBox.Create(Self);
-    with OptionsGroupBox do begin
-      Name:='OptionsGroupBox';
-      Parent:=Self;
-      Caption:=lisLazBuildOptions;
-      Left:=5;
-      Top:=WorkingDirLabel.Top+WorkingDirLabel.Height+12;
-      Width:=Self.ClientWidth-Left-Left;
-      Height:=66;
-    end;
-    
-    OptionScanOutputForFPCMessagesCheckBox:=TCheckBox.Create(Self);
-    with OptionScanOutputForFPCMessagesCheckBox do begin
-      Name:='OptionScanOutputForFPCMessagesCheckBox';
-      Parent:=OptionsGroupBox;
-      SetBounds(5,2,400,20);
-      Caption:=lisEdtExtToolScanOutputForFreePascalCompilerMessages;
-    end;
-
-    OptionScanOutputForMakeMessagesCheckBox:=TCheckBox.Create(Self);
-    with OptionScanOutputForMakeMessagesCheckBox do begin
-      Name:='OptionScanOutputForMakeMessagesCheckBox';
-      Parent:=OptionsGroupBox;
-      SetBounds(5,OptionScanOutputForFPCMessagesCheckBox.Top
-                +OptionScanOutputForFPCMessagesCheckBox.Height+4,400,20);
-      Caption:=lisEdtExtToolScanOutputForMakeMessages;
-    end;
-
-    KeyGroupBox:=TGroupBox.Create(Self);
-    with KeyGroupBox do begin
-      Name:='KeyGroupBox';
-      Parent:=Self;
-      Caption:=lisEdtExtToolKey;
-      Left:=5;
-      Top:=OptionsGroupBox.Top+OptionsGroupBox.Height+12;
-      Width:=Self.ClientWidth-Left-Left;
-      Height:=50;
-    end;
-
-    KeyCtrlCheckBox:=TCheckBox.Create(Self);
-    with KeyCtrlCheckBox do begin
-      Name:='KeyCtrlCheckBox';
-      Parent:=KeyGroupBox;
-      Caption:=lisEdtExtToolCtrl;
-      Left:=5;
-      Top:=2;
-      Width:=50;
-      Height:=20;
-    end;
-
-    KeyAltCheckBox:=TCheckBox.Create(Self);
-    with KeyAltCheckBox do begin
-      Name:='KeyAltCheckBox';
-      Parent:=KeyGroupBox;
-      Caption:=lisEdtExtToolAlt;
-      Left:=KeyCtrlCheckBox.Left+KeyCtrlCheckBox.Width+10;
-      Top:=KeyCtrlCheckBox.Top;
-      Height:=20;
-      Width:=KeyCtrlCheckBox.Width;
-    end;
-
-    KeyShiftCheckBox:=TCheckBox.Create(Self);
-    with KeyShiftCheckBox do begin
-      Name:='KeyShiftCheckBox';
-      Parent:=KeyGroupBox;
-      Caption:=lisEdtExtToolShift;
-      Left:=KeyAltCheckBox.Left+KeyAltCheckBox.Width+10;
-      Top:=KeyCtrlCheckBox.Top;
-      Height:=20;
-      Width:=KeyCtrlCheckBox.Width;
-    end;
-
-    KeyComboBox:=TComboBox.Create(Self);
-    with KeyComboBox do begin
-      Name:='KeyComboBox';
-      Parent:=KeyGroupBox;
-      Left:=KeyShiftCheckBox.Left+KeyShiftCheckBox.Width+10;
-      Top:=KeyCtrlCheckBox.Top;
-      Width:=190;
-      Items.BeginUpdate;
-      Items.Add('none');
-      for i:=1 to 145 do begin
-        s:=KeyAndShiftStateToEditorKeyString(i,[]);
-        if not EditorKeyStringIsIrregular(s) then
-          Items.Add(s);
-      end;
-      Items.EndUpdate;
-      ItemIndex:=0;
-    end;
-    
-    KeyGrabButton:=TButton.Create(Self);
-    with KeyGrabButton do begin
-      Parent:=KeyGroupBox;
-      Left:=KeyComboBox.Left+KeyComboBox.Width+10;
-      Top:=KeyCtrlCheckBox.Top;
-      Width:=150;
-      Height:=25;
-      Caption:=srkmGrabKey;
-      Name:='KeyGrabButton';
-      OnClick:=@KeyGrabButtonClick;
-    end;
-
-    MacrosGroupbox:=TGroupbox.Create(Self);
-    with MacrosGroupbox do begin
-      Name:='MacrosGroupbox';
-      Parent:=Self;
-      Left:=KeyGroupBox.Left;
-      Top:=KeyGroupBox.Top+KeyGroupBox.Height+10;
-      Width:=KeyGroupBox.Width;
-      Height:=Self.ClientHeight-50-Top;
-      Caption:=lisEdtExtToolMacros;
-      OnResize:=@MacrosGroupboxResize;
-    end;
-    
-    MacrosListbox:=TListbox.Create(Self);
-    with MacrosListbox do begin
-      Name:='MacrosListbox';
-      Parent:=MacrosGroupbox;
-      SetBounds(5,5,MacrosGroupbox.ClientWidth-120,
-                   MacrosGroupbox.ClientHeight-30);
-      OnClick:=@MacrosListboxClick;
-    end;
-    
-    MacrosInsertButton:=TButton.Create(Self);
-    with MacrosInsertButton do begin
-      Name:='MacrosInsertButton';
-      Parent:=MacrosGroupbox;
-      SetBounds(MacrosGroupbox.ClientWidth-90,5,70,25);
-      Caption:=lisEdtExtToolInsert;
-      OnClick:=@MacrosInsertButtonClick;
-      Enabled:=false;
-    end;
-    
-    OkButton:=TButton.Create(Self);
-    with OkButton do begin
-      Name:='OkButton';
-      Parent:=Self;
-      SetBounds(270,Self.ClientHeight-40,100,25);
-      Caption:=lisLazBuildOk;
-      OnClick:=@OkButtonClick;
-      Default:=true;
-    end;
-    
-    CancelButton:=TButton.Create(Self);
-    with CancelButton do begin
-      Name:='CancelButton';
-      Parent:=Self;
-      SetBounds(390,OkButton.Top,100,25);
-      Caption:=dlgCancel;
-      OnClick:=@CancelButtonClick;
-      Cancel:=true;
-    end;
-    
-    OnResize:=@ExternalToolOptionDlgResize;
-    KeyPreview:=true;
-    OnKeyUp:=@FormKeyUp;
-  end;
-  fOptions:=TExternalToolOptions.Create;
-  ExternalToolOptionDlgResize(nil);
-end;
-
-destructor TExternalToolOptionDlg.Destroy;
-begin
-  fOptions.Free;
-  inherited Destroy;
-end;
-
 procedure TExternalToolOptionDlg.OpenButtonClick(sender : TOBject);
 begin
   OpenDialog.FileName := FilenameEdit.Text;
@@ -466,150 +189,82 @@ begin
     fOptions.ScanOutputForMakeMessages;
 end;
 
-procedure TExternalToolOptionDlg.OkButtonClick(Sender: TObject);
+procedure TExternalToolOptionDlg.FormCreate(Sender: TObject);
+var
+  i: word;
+  s: string;
 begin
-  if (TitleEdit.Text='') or (FilenameEdit.Text='') then begin
+  GrabbingKey:=0;
-    MessageDlg(lisEdtExtToolTitleAndFilenameRequired,
+  Caption:=lisEdtExtToolEditTool;
-                  lisEdtExtToolAValidToolNeedsAtLeastATitleAndAFilename,
-                  mtError, [mbCancel], 0);
-    exit;
-  end;
-  SaveToOptions;
-  ModalResult:=mrOk;
-end;
 
-procedure TExternalToolOptionDlg.CancelButtonClick(Sender: TObject);
+  with TitleLabel do
-begin
+    Caption:=dlgPOTitle;
-  ModalResult:=mrCancel;
-end;
 
-procedure TExternalToolOptionDlg.ExternalToolOptionDlgResize(Sender: TObject);
+  with FilenameLabel do
-begin
+    Caption:=lisEdtExtToolProgramfilename;
-  with TitleLabel do begin
+
-    SetBounds(5,5,110,22);
+  with OpenButton do
+    Hint:=lisClickHereToBrowseTheFileHint;
+
+  with OpenDialog do begin
+    Title:=lisSelectFile;
+    Filter:=lisExePrograms+' (*.exe)|*.exe|'+lisAllFiles+' (*.*)|*.*';
   end;
 
-  with TitleEdit do begin
+  with ParametersLabel do
-    Left:=TitleLabel.Left+TitleLabel.Width+5;
+    Caption:=lisEdtExtToolParameters;
-    Top:=TitleLabel.Top+2;
-    Width:=Self.ClientWidth-Left-10;
-    Height:=25;
-  end;
 
-  with FilenameLabel do begin
+  with WorkingDirLabel do
-    SetBounds(TitleLabel.Left,TitleLabel.Top+TitleLabel.Height+10,
+    Caption:=lisEdtExtToolWorkingDirectory;
-      TitleLabel.Width,TitleLabel.Height);
-  end;
 
-  with FilenameEdit do begin
+  with OptionsGroupBox do
-    SetBounds(TitleEdit.Left,FilenameLabel.Top+2,TitleEdit.Width-TitleEdit.Height-5,
+    Caption:=lisLazBuildOptions;
-              TitleEdit.Height);
-  end;
 
-  with ParametersLabel do begin
+  with OptionScanOutputForFPCMessagesCheckBox do
-    SetBounds(FilenameLabel.Left,FilenameLabel.Top+FilenameLabel.Height+10,
+    Caption:=lisEdtExtToolScanOutputForFreePascalCompilerMessages;
-      FilenameLabel.Width,FilenameLabel.Height);
-  end;
 
-  with ParametersEdit do begin
+  with OptionScanOutputForMakeMessagesCheckBox do
-    SetBounds(FilenameEdit.Left,ParametersLabel.Top+2,TitleEdit.Width,
+    Caption:=lisEdtExtToolScanOutputForMakeMessages;
-      FilenameEdit.Height);
-  end;
 
-  with WorkingDirLabel do begin
+  with KeyGroupBox do
-    SetBounds(ParametersLabel.Left,
+    Caption:=lisEdtExtToolKey;
-      ParametersLabel.Top+ParametersLabel.Height+10,ParametersLabel.Width,
-      ParametersLabel.Height);
-  end;
 
-  with WorkingDirEdit do begin
+  with KeyCtrlCheckBox do
-    SetBounds(ParametersEdit.Left,WorkingDirLabel.Top+2,ParametersEdit.Width,
+    Caption:=lisEdtExtToolCtrl;
-      ParametersEdit.Height);
-  end;
 
-  with OptionsGroupBox do begin
+  with KeyAltCheckBox do
-    Left:=5;
+    Caption:=lisEdtExtToolAlt;
-    Top:=WorkingDirLabel.Top+WorkingDirLabel.Height+12;
-    Width:=Self.ClientWidth-Left-Left;
-    Height:=66;
-  end;
 
-  with OptionScanOutputForFPCMessagesCheckBox do begin
+  with KeyShiftCheckBox do
-    SetBounds(5,2,400,20);
+    Caption:=lisEdtExtToolShift;
-  end;
-
-  with OptionScanOutputForMakeMessagesCheckBox do begin
-    SetBounds(5,OptionScanOutputForFPCMessagesCheckBox.Top
-              +OptionScanOutputForFPCMessagesCheckBox.Height+4,400,20);
-  end;
-
-  with KeyGroupBox do begin
-    Left:=5;
-    Top:=OptionsGroupBox.Top+OptionsGroupBox.Height+12;
-    Width:=Self.ClientWidth-Left-Left;
-    Height:=50;
-  end;
-
-  with KeyCtrlCheckBox do begin
-    Left:=5;
-    Top:=2;
-    Width:=45;
-    Height:=20;
-  end;
-
-  with KeyAltCheckBox do begin
-    Left:=KeyCtrlCheckBox.Left+KeyCtrlCheckBox.Width+5;
-    Top:=KeyCtrlCheckBox.Top;
-    Height:=20;
-    Width:=KeyCtrlCheckBox.Width;
-  end;
-
-  with KeyShiftCheckBox do begin
-    Left:=KeyAltCheckBox.Left+KeyAltCheckBox.Width+5;
-    Top:=KeyCtrlCheckBox.Top;
-    Height:=20;
-    Width:=KeyCtrlCheckBox.Width;
-  end;
 
   with KeyComboBox do begin
-    Left:=KeyShiftCheckBox.Left+KeyShiftCheckBox.Width+5;
+    Items.BeginUpdate;
-    Top:=KeyCtrlCheckBox.Top;
+    Items.Add(srVK_NONE);
-    Width:=190;
+    for i:=1 to 145 do begin
+      s:=KeyAndShiftStateToEditorKeyString(i,[]);
+      if not EditorKeyStringIsIrregular(s) then
+        Items.Add(s);
+    end;
+    Items.EndUpdate;
+    ItemIndex:=0;
   end;
 
-  with KeyGrabButton do begin
+  with KeyGrabButton do
-    Left:=KeyComboBox.Left+KeyComboBox.Width+5;
+    Caption:=srkmGrabKey;
-    Top:=KeyCtrlCheckBox.Top;
-    Width:=100;
-    Height:=25;
-  end;
 
-  with MacrosGroupbox do begin
+  with MacrosGroupbox do
-    Left:=KeyGroupBox.Left;
+    Caption:=lisEdtExtToolMacros;
-    Top:=KeyGroupBox.Top+KeyGroupBox.Height+10;
-    Width:=KeyGroupBox.Width;
-    Height:=Self.ClientHeight-50-Top;
-  end;
 
-  with OkButton do begin
+  with MacrosInsertButton do
-    SetBounds(270,Self.ClientHeight-40,100,25);
+    Caption:=lisCodeTemplAdd;
-  end;
 
-  with CancelButton do begin
+  fOptions:=TExternalToolOptions.Create;
-    SetBounds(390,OkButton.Top,100,25);
-  end;
 end;
 
-procedure TExternalToolOptionDlg.MacrosGroupboxResize(Sender: TObject);
+procedure TExternalToolOptionDlg.FormDestroy(Sender: TObject);
 begin
-  with MacrosInsertButton do begin
+  fOptions.Free;
-    SetBounds(MacrosGroupbox.ClientWidth-75,5,70,MacrosInsertButton.Height);
-  end;
-  
-  with MacrosListbox do begin
-    SetBounds(2,2,MacrosInsertButton.Left-5,
-                 MacrosGroupbox.ClientHeight-4);
-  end;
 end;
 
 procedure TExternalToolOptionDlg.KeyGrabButtonClick(Sender: TObject);
@@ -694,7 +349,7 @@ begin
     end;
   end;
   if GrabbingKey=1 then
-    KeyGrabButton.Caption:=srkmPressKey
+    KeyGrabButton.Caption:=srkmPressKey;
 end;
 
 procedure TExternalToolOptionDlg.FormKeyUp(Sender: TObject; var Key: Word;
@@ -735,6 +390,18 @@ begin
   MacrosInsertButton.Enabled:=(MacrosListbox.ItemIndex>=0);
 end;
 
+procedure TExternalToolOptionDlg.OKButtonClick(Sender: TObject);
+begin
+  if (TitleEdit.Text='') or (FilenameEdit.Text='') then begin
+    MessageDlg(lisEdtExtToolTitleAndFilenameRequired,
+                  lisEdtExtToolAValidToolNeedsAtLeastATitleAndAFilename,
+                  mtError, [mbCancel], 0);
+    exit;
+  end;
+  SaveToOptions;
+  ModalResult:=mrOk;
+end;
+
 { TExternalToolOptions }
 
 procedure TExternalToolOptions.Assign(Source: TPersistent);
@@ -756,4 +423,7 @@ begin
   inherited Clear;
 end;
 
+initialization
+  {$I exttooleditdlg.lrs}
+
 end.

ide/lazarusidestrconsts.pas

@@ -688,6 +688,9 @@ resourcestring
   lisOpenProjectFile = 'Open Project File';
   lisLazarusProjectInfoFile = 'Lazarus Project Info file';
   lisAllFiles = 'All Files';
+  lisExePrograms = 'Programs';
+  lisSelectFile = 'Select the file';
+  lisClickHereToBrowseTheFileHint = 'Click here to browse the file';
   lisProjectClosed = 'Project closed';
   lisTheProjectIsClosedThereAreNowThreePossibilitiesHin = 'The project is '
     +'closed. There are now three possibilities.%sHint: You do not need to '
@@ -1924,6 +1927,7 @@ resourcestring
   srVK_NUMLOCK    = 'Numlock';
   srVK_SCROLL     = 'Scroll';
   srVK_IRREGULAR  = 'Irregular ';
+  srVK_NONE       = 'none';
   srkm_Alt        = 'Alt';
   srkm_Ctrl       = 'Ctrl';