From b88178d60613814031020e139814cabe5952614b Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 9 Apr 2006 20:07:59 +0000
Subject: [PATCH] improved layout of ide code makro dlg

git-svn-id: trunk@9095 -
---
 ide/codetemplatesdlg.lfm | 222 +++++++++++++++++++++++----------------
 ide/codetemplatesdlg.lrs | 221 ++++++++++++++++++++------------------
 ide/codetemplatesdlg.pas |   5 +-
 3 files changed, 256 insertions(+), 192 deletions(-)

diff --git a/ide/codetemplatesdlg.lfm b/ide/codetemplatesdlg.lfm
index b29c9dccee..594a9ab1a0 100644
--- a/ide/codetemplatesdlg.lfm
+++ b/ide/codetemplatesdlg.lfm
@@ -1,28 +1,29 @@
 object CodeTemplateDialog: TCodeTemplateDialog
   ActiveControl = FilenameEdit
+  BorderIcons = [biSystemMenu]
   Caption = 'CodeTemplateDialog'
-  ClientHeight = 450
-  ClientWidth = 600
+  ClientHeight = 519
+  ClientWidth = 497
   OnClose = FormClose
   OnCreate = FormCreate
-  PixelsPerInch = 75
-  HorzScrollBar.Page = 599
-  VertScrollBar.Page = 449
-  Left = 290
-  Height = 450
-  Top = 163
-  Width = 600
+  PixelsPerInch = 112
+  HorzScrollBar.Page = 496
+  VertScrollBar.Page = 518
+  Left = 310
+  Height = 519
+  Top = 162
+  Width = 497
   object FilenameGroupBox: TGroupBox
     Align = alTop
-    BorderSpacing.Around = 5
+    BorderSpacing.Around = 6
     Caption = 'FilenameGroupBox'
-    ClientHeight = 42
-    ClientWidth = 586
+    ClientHeight = 34
+    ClientWidth = 481
     TabOrder = 0
-    Left = 5
-    Height = 59
-    Top = 5
-    Width = 590
+    Left = 6
+    Height = 51
+    Top = 6
+    Width = 485
     object FilenameEdit: TEdit
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Right = 5
@@ -32,81 +33,68 @@ object CodeTemplateDialog: TCodeTemplateDialog
       Left = 9
       Height = 23
       Top = 4
-      Width = 531
+      Width = 435
     end
     object FilenameButton: TButton
-      Anchors = [akTop, akLeft, akBottom]
+      Anchors = [akRight, akBottom]
+      BorderSpacing.Right = 6
       BorderSpacing.InnerBorder = 2
       Caption = '...'
       OnClick = FilenameButtonClick
       TabOrder = 1
+      AnchorSideRight.Control = FilenameGroupBox
+      AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = FilenameEdit
       AnchorSideBottom.Side = asrBottom
-      Left = 545
+      Left = 449
       Height = 23
       Top = 4
-      Width = 30
+      Width = 26
     end
   end
-  object OkButton: TButton
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 14
-    BorderSpacing.InnerBorder = 2
-    Caption = 'OkButton'
-    OnClick = OkButtonClick
-    TabOrder = 1
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = CancelButton
-    AnchorSideBottom.Side = asrBottom
-    Left = 427
-    Height = 26
-    Top = 414
-    Width = 61
-  end
-  object CancelButton: TButton
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.InnerBorder = 2
-    Caption = 'CancelButton'
-    ModalResult = 2
-    TabOrder = 2
-    Left = 502
-    Height = 26
-    Top = 414
-    Width = 85
-  end
   object TemplateGroupBox: TGroupBox
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderSpacing.Around = 5
+    BorderSpacing.Around = 6
+    BorderSpacing.InnerBorder = 6
     Caption = 'TemplateGroupBox'
-    ClientHeight = 323
-    ClientWidth = 586
-    TabOrder = 3
+    ClientHeight = 399
+    ClientWidth = 481
+    TabOrder = 1
     AnchorSideBottom.Control = CancelButton
-    Left = 5
-    Height = 340
-    Top = 69
-    Width = 590
+    Left = 6
+    Height = 416
+    Top = 63
+    Width = 485
     object TemplateListBox: TListBox
       Anchors = [akTop, akLeft, akRight, akBottom]
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Right = 6
       OnSelectionChange = TemplateListBoxSelectionChange
       TabOrder = 0
       TopIndex = -1
-      AnchorSideBottom.Control = TemplateSplitter
-      Height = 190
-      Width = 412
+      AnchorSideLeft.Control = TemplateGroupBox
+      AnchorSideTop.Control = TemplateGroupBox
+      AnchorSideRight.Control = AddButton
+      AnchorSideBottom.Control = InsertMacroButton
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
+      Height = 180
+      Top = 6
+      Width = 348
     end
     object TemplateSynEdit: TSynEdit
       Align = alBottom
+      BorderSpacing.Around = 6
+      Anchors = [akTop, akLeft, akRight, akBottom]
       Font.Height = -18
       Font.Name = 'courier'
-      Height = 128
+      Height = 201
       Name = 'TemplateSynEdit'
       ParentColor = False
       TabOrder = 1
-      Width = 586
+      Width = 469
       BookMarkOptions.OnChange = nil
       Gutter.OnChange = nil
       Gutter.CodeFoldingWidth = 14
@@ -436,78 +424,134 @@ object CodeTemplateDialog: TCodeTemplateDialog
         'TemplateSynEdit'
       )
       SelectedColor.OnChange = nil
+      AnchorSideTop.Control = TemplateListBox
+      AnchorSideTop.Side = asrBottom
       Cursor = crIBeam
-      Height = 128
-      Top = 195
-      Width = 586
-    end
-    object TemplateSplitter: TSplitter
-      Align = alBottom
-      Cursor = crVSplit
-      Height = 5
-      Width = 586
-      ResizeAnchor = akBottom
-      Cursor = crVSplit
-      Height = 5
-      Top = 190
-      Width = 586
+      Left = 6
+      Height = 201
+      Top = 192
+      Width = 469
     end
     object AddButton: TButton
       Anchors = [akTop, akRight]
+      BorderSpacing.Right = 6
       BorderSpacing.InnerBorder = 2
       Caption = 'AddButton'
       OnClick = AddButtonClick
       TabOrder = 2
-      Left = 461
+      AnchorSideTop.Control = TemplateListBox
+      AnchorSideRight.Control = TemplateGroupBox
+      AnchorSideRight.Side = asrBottom
+      Left = 360
       Height = 30
+      Top = 6
       Width = 115
     end
     object DeleteButton: TButton
       Anchors = [akTop, akRight]
+      BorderSpacing.Top = 6
       BorderSpacing.InnerBorder = 2
       Caption = 'DeleteButton'
       OnClick = DeleteButtonClick
       TabOrder = 3
-      Left = 461
+      AnchorSideTop.Control = AddButton
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = AddButton
+      AnchorSideRight.Side = asrBottom
+      Left = 360
       Height = 30
-      Top = 36
+      Top = 42
       Width = 115
     end
     object EditButton: TButton
       Anchors = [akTop, akRight]
+      BorderSpacing.Top = 6
       BorderSpacing.InnerBorder = 2
       Caption = 'EditButton'
       OnClick = EditButtonClick
       TabOrder = 4
-      Left = 461
+      AnchorSideTop.Control = DeleteButton
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = DeleteButton
+      AnchorSideRight.Side = asrBottom
+      Left = 360
       Height = 30
-      Top = 71
+      Top = 78
       Width = 115
     end
     object UseMakrosCheckBox: TCheckBox
-      Anchors = [akTop, akRight]
+      BorderSpacing.Top = 12
       Caption = 'UseMakrosCheckBox'
       TabOrder = 5
-      Left = 433
+      AnchorSideLeft.Control = EditButton
+      AnchorSideTop.Control = EditButton
+      AnchorSideTop.Side = asrBottom
+      Left = 360
       Height = 24
-      Top = 106
-      Width = 143
+      Top = 120
+      Width = 146
     end
     object InsertMacroButton: TButton
       Anchors = [akTop, akRight]
+      BorderSpacing.Top = 6
+      BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 2
       Caption = 'InsertMacroButton'
       OnClick = InsertMacroButtonClick
       TabOrder = 6
-      Left = 461
-      Height = 25
-      Top = 141
+      AnchorSideTop.Control = UseMakrosCheckBox
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = TemplateGroupBox
+      AnchorSideRight.Side = asrBottom
+      Left = 360
+      Height = 30
+      Top = 156
       Width = 115
     end
   end
+  object CancelButton: TBitBtn
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    BorderSpacing.InnerBorder = 2
+    Cancel = True
+    Caption = 'Cancel'
+    Kind = bkCancel
+    ModalResult = 2
+    NumGlyphs = 0
+    TabOrder = 2
+    AnchorSideRight.Control = OkButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 361
+    Height = 28
+    Top = 485
+    Width = 73
+  end
+  object OkButton: TBitBtn
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    BorderSpacing.InnerBorder = 2
+    Caption = '&OK'
+    Default = True
+    Kind = bkOK
+    ModalResult = 1
+    NumGlyphs = 0
+    OnClick = OkButtonClick
+    TabOrder = 3
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 440
+    Height = 28
+    Top = 485
+    Width = 51
+  end
   object ASynPasSyn: TSynPasSyn
     Enabled = False
-    left = 280
-    top = 216
+    left = 272
+    top = 24
   end
 end
diff --git a/ide/codetemplatesdlg.lrs b/ide/codetemplatesdlg.lrs
index 3231c0210e..7123470fc0 100644
--- a/ide/codetemplatesdlg.lrs
+++ b/ide/codetemplatesdlg.lrs
@@ -2,104 +2,125 @@
 
 LazarusResources.Add('TCodeTemplateDialog','FORMDATA',[
   'TPF0'#19'TCodeTemplateDialog'#18'CodeTemplateDialog'#13'ActiveControl'#7#12
-  +'FilenameEdit'#7'Caption'#6#18'CodeTemplateDialog'#12'ClientHeight'#3#194#1
-  +#11'ClientWidth'#3'X'#2#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10'FormCreat'
-  +'e'#13'PixelsPerInch'#2'K'#18'HorzScrollBar.Page'#3'W'#2#18'VertScrollBar.Pa'
-  +'ge'#3#193#1#4'Left'#3'"'#1#6'Height'#3#194#1#3'Top'#3#163#0#5'Width'#3'X'#2
-  +#0#9'TGroupBox'#16'FilenameGroupBox'#5'Align'#7#5'alTop'#20'BorderSpacing.Ar'
-  +'ound'#2#5#7'Caption'#6#16'FilenameGroupBox'#12'ClientHeight'#2'*'#11'Client'
-  +'Width'#3'J'#2#8'TabOrder'#2#0#4'Left'#2#5#6'Height'#2';'#3'Top'#2#5#5'Width'
-  +#3'N'#2#0#5'TEdit'#12'FilenameEdit'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
-  +'ht'#0#19'BorderSpacing.Right'#2#5#8'TabOrder'#2#0#4'Text'#6#12'FilenameEdit'
-  +#23'AnchorSideRight.Control'#7#14'FilenameButton'#4'Left'#2#9#6'Height'#2#23
-  +#3'Top'#2#4#5'Width'#3#19#2#0#0#7'TButton'#14'FilenameButton'#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'
-  +#6#3'...'#7'OnClick'#7#19'FilenameButtonClick'#8'TabOrder'#2#1#24'AnchorSide'
-  +'Bottom.Control'#7#12'FilenameEdit'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#3'!'#2#6'Height'#2#23#3'Top'#2#4#5'Width'#2#30#0#0#0#7'TButton'#8'O'
-  +'kButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpac'
-  +'ing.Right'#2#14#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#8'OkButton'#7
-  +'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#1#23'AnchorSideRight.Control'#7
-  +#12'CancelButton'#24'AnchorSideBottom.Control'#7#12'CancelButton'#21'AnchorS'
-  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3#171#1#6'Height'#2#26#3'Top'#3#158#1
-  +#5'Width'#2'='#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#7'akRight'#8'ak'
-  +'Bottom'#0#8'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#12'C'
-  +'ancelButton'#11'ModalResult'#2#2#8'TabOrder'#2#2#4'Left'#3#246#1#6'Height'#2
-  +#26#3'Top'#3#158#1#5'Width'#2'U'#0#0#9'TGroupBox'#16'TemplateGroupBox'#5'Ali'
-  +'gn'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20
-  +'BorderSpacing.Around'#2#5#7'Caption'#6#16'TemplateGroupBox'#12'ClientHeight'
-  +#3'C'#1#11'ClientWidth'#3'J'#2#8'TabOrder'#2#3#24'AnchorSideBottom.Control'#7
-  +#12'CancelButton'#4'Left'#2#5#6'Height'#3'T'#1#3'Top'#2'E'#5'Width'#3'N'#2#0
-  +#8'TListBox'#15'TemplateListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#17'OnSelectionChange'#7#30'TemplateListBoxSelectionChange'#8
-  +'TabOrder'#2#0#8'TopIndex'#2#255#24'AnchorSideBottom.Control'#7#16'TemplateS'
-  +'plitter'#6'Height'#3#190#0#5'Width'#3#156#1#0#0#8'TSynEdit'#15'TemplateSynE'
-  +'dit'#5'Align'#7#8'alBottom'#11'Font.Height'#2#238#9'Font.Name'#6#7'courier'
-  +#6'Height'#3#128#0#4'Name'#6#15'TemplateSynEdit'#11'ParentColor'#8#8'TabOrde'
-  +'r'#2#1#5'Width'#3'J'#2#24'BookMarkOptions.OnChange'#13#15'Gutter.OnChange'
-  +#13#23'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#10'ASynPasSyn'#10'Key'
-  +'strokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCu'
-  +'t'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'Shor'
-  +'tCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'S'
-  +'hortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Sh'
-  +'ortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Sh'
-  +'ortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Sh'
-  +'ortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8
-  +'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8
-  +'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8
-  +'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S'
-  +'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8
-  +'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S'
-  +'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8
-  +'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S'
-  +'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8
-  +'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
-  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
-  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
-  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
-  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
-  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
-  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
-  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
-  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
-  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
-  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
-  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
-  ,'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
-  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
-  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
-  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
-  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
-  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
-  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
-  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
-  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
-  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
-  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
-  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
-  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
-  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
-  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
-  +#0#0#13'Lines.Strings'#1#6#15'TemplateSynEdit'#0#22'SelectedColor.OnChange'
-  +#13#6'Cursor'#7#7'crIBeam'#6'Height'#3#128#0#3'Top'#3#195#0#5'Width'#3'J'#2#0
-  +#0#9'TSplitter'#16'TemplateSplitter'#5'Align'#7#8'alBottom'#6'Cursor'#7#8'cr'
-  +'VSplit'#6'Height'#2#5#5'Width'#3'J'#2#12'ResizeAnchor'#7#8'akBottom'#6'Curs'
-  +'or'#7#8'crVSplit'#6'Height'#2#5#3'Top'#3#190#0#5'Width'#3'J'#2#0#0#7'TButto'
-  +'n'#9'AddButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerB'
-  +'order'#2#2#7'Caption'#6#9'AddButton'#7'OnClick'#7#14'AddButtonClick'#8'TabO'
-  +'rder'#2#2#4'Left'#3#205#1#6'Height'#2#30#5'Width'#2's'#0#0#7'TButton'#12'De'
-  +'leteButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorde'
-  +'r'#2#2#7'Caption'#6#12'DeleteButton'#7'OnClick'#7#17'DeleteButtonClick'#8'T'
-  +'abOrder'#2#3#4'Left'#3#205#1#6'Height'#2#30#3'Top'#2'$'#5'Width'#2's'#0#0#7
-  +'TButton'#10'EditButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacin'
-  +'g.InnerBorder'#2#2#7'Caption'#6#10'EditButton'#7'OnClick'#7#15'EditButtonCl'
-  +'ick'#8'TabOrder'#2#4#4'Left'#3#205#1#6'Height'#2#30#3'Top'#2'G'#5'Width'#2
-  +'s'#0#0#9'TCheckBox'#17'UseMakrosCheckBox'#7'Anchors'#11#5'akTop'#7'akRight'
-  +#0#7'Caption'#6#17'UseMakrosCheckBox'#8'TabOrder'#2#5#4'Left'#3#177#1#6'Heig'
-  +'ht'#2#24#3'Top'#2'j'#5'Width'#3#143#0#0#0#7'TButton'#17'InsertMacroButton'#7
-  +'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#2#7'Capti'
-  +'on'#6#17'InsertMacroButton'#7'OnClick'#7#22'InsertMacroButtonClick'#8'TabOr'
-  +'der'#2#6#4'Left'#3#205#1#6'Height'#2#25#3'Top'#3#141#0#5'Width'#2's'#0#0#0
-  +#10'TSynPasSyn'#10'ASynPasSyn'#7'Enabled'#8#4'left'#3#24#1#3'top'#3#216#0#0#0
-  +#0
+  +'FilenameEdit'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#18'CodeTem'
+  +'plateDialog'#12'ClientHeight'#3#7#2#11'ClientWidth'#3#241#1#7'OnClose'#7#9
+  +'FormClose'#8'OnCreate'#7#10'FormCreate'#13'PixelsPerInch'#2'p'#18'HorzScrol'
+  +'lBar.Page'#3#240#1#18'VertScrollBar.Page'#3#6#2#4'Left'#3'6'#1#6'Height'#3#7
+  +#2#3'Top'#3#162#0#5'Width'#3#241#1#0#9'TGroupBox'#16'FilenameGroupBox'#5'Ali'
+  +'gn'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'FilenameGroupBo'
+  +'x'#12'ClientHeight'#2'"'#11'ClientWidth'#3#225#1#8'TabOrder'#2#0#4'Left'#2#6
+  +#6'Height'#2'3'#3'Top'#2#6#5'Width'#3#229#1#0#5'TEdit'#12'FilenameEdit'#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#5#8'Tab'
+  +'Order'#2#0#4'Text'#6#12'FilenameEdit'#23'AnchorSideRight.Control'#7#14'File'
+  +'nameButton'#4'Left'#2#9#6'Height'#2#23#3'Top'#2#4#5'Width'#3#179#1#0#0#7'TB'
+  +'utton'#14'FilenameButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#19'BorderS'
+  +'pacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'...'#7'O'
+  +'nClick'#7#19'FilenameButtonClick'#8'TabOrder'#2#1#23'AnchorSideRight.Contro'
+  +'l'#7#16'FilenameGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anchor'
+  +'SideBottom.Control'#7#12'FilenameEdit'#21'AnchorSideBottom.Side'#7#9'asrBot'
+  +'tom'#4'Left'#3#193#1#6'Height'#2#23#3'Top'#2#4#5'Width'#2#26#0#0#0#9'TGroup'
+  +'Box'#16'TemplateGroupBox'#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLe'
+  +'ft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#25'BorderSpacing.'
+  +'InnerBorder'#2#6#7'Caption'#6#16'TemplateGroupBox'#12'ClientHeight'#3#143#1
+  +#11'ClientWidth'#3#225#1#8'TabOrder'#2#1#24'AnchorSideBottom.Control'#7#12'C'
+  +'ancelButton'#4'Left'#2#6#6'Height'#3#160#1#3'Top'#2'?'#5'Width'#3#229#1#0#8
+  +'TListBox'#15'TemplateListBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderS'
+  +'pacing.Right'#2#6#17'OnSelectionChange'#7#30'TemplateListBoxSelectionChange'
+  +#8'TabOrder'#2#0#8'TopIndex'#2#255#22'AnchorSideLeft.Control'#7#16'TemplateG'
+  +'roupBox'#21'AnchorSideTop.Control'#7#16'TemplateGroupBox'#23'AnchorSideRigh'
+  +'t.Control'#7#9'AddButton'#24'AnchorSideBottom.Control'#7#17'InsertMacroButt'
+  +'on'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#180#0#3
+  +'Top'#2#6#5'Width'#3'\'#1#0#0#8'TSynEdit'#15'TemplateSynEdit'#5'Align'#7#8'a'
+  +'lBottom'#20'BorderSpacing.Around'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'Right'#8'akBottom'#0#11'Font.Height'#2#238#9'Font.Name'#6#7'courier'#6'Heig'
+  +'ht'#3#201#0#4'Name'#6#15'TemplateSynEdit'#11'ParentColor'#8#8'TabOrder'#2#1
+  +#5'Width'#3#213#1#24'BookMarkOptions.OnChange'#13#15'Gutter.OnChange'#13#23
+  +'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#10'ASynPasSyn'#10'Keystroke'
+  +'s'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'&'
+  +' '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2
+  +'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'
+  +#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3
+  +'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3
+  +'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3
+  +''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3
+  +'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3
+  +'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3
+  +'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'!'
+  +' '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3
+  +'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$'
+  +' '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3
+  +'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'#'
+  +' '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3
+  +'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortC'
+  +'ut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8
+  +'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3
+  +#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7
+  +'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2
+  +#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortC'
+  +'ut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8
+  +'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3
+  +#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Comma'
+  +'nd'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7
+  +'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'
+  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3
+  ,'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCu'
+  +'t'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'Sh'
+  +'ortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1
+  +#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3
+  +'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Comman'
+  +'d'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'C'
+  +'ommand'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1
+  +#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'
+  +#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3
+  +'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCu'
+  +'t'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'S'
+  +'hortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233
+  +#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3
+  +'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lin'
+  +'es.Strings'#1#6#15'TemplateSynEdit'#0#22'SelectedColor.OnChange'#13#21'Anch'
+  +'orSideTop.Control'#7#15'TemplateListBox'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#6'Cursor'#7#7'crIBeam'#4'Left'#2#6#6'Height'#3#201#0#3'Top'#3#192#0#5'W'
+  +'idth'#3#213#1#0#0#7'TButton'#9'AddButton'#7'Anchors'#11#5'akTop'#7'akRight'
+  +#0#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6
+  +#9'AddButton'#7'OnClick'#7#14'AddButtonClick'#8'TabOrder'#2#2#21'AnchorSideT'
+  +'op.Control'#7#15'TemplateListBox'#23'AnchorSideRight.Control'#7#16'Template'
+  +'GroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'h'#1#6'Height'#2
+  +#30#3'Top'#2#6#5'Width'#2's'#0#0#7'TButton'#12'DeleteButton'#7'Anchors'#11#5
+  +'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#6#25'BorderSpacing.InnerBorder'
+  +#2#2#7'Caption'#6#12'DeleteButton'#7'OnClick'#7#17'DeleteButtonClick'#8'TabO'
+  +'rder'#2#3#21'AnchorSideTop.Control'#7#9'AddButton'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#23'AnchorSideRight.Control'#7#9'AddButton'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#3'h'#1#6'Height'#2#30#3'Top'#2'*'#5'Width'#2's'
+  +#0#0#7'TButton'#10'EditButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'Border'
+  +'Spacing.Top'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#10'EditButt'
+  +'on'#7'OnClick'#7#15'EditButtonClick'#8'TabOrder'#2#4#21'AnchorSideTop.Contr'
+  +'ol'#7#12'DeleteButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideR'
+  +'ight.Control'#7#12'DeleteButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#3'h'#1#6'Height'#2#30#3'Top'#2'N'#5'Width'#2's'#0#0#9'TCheckBox'#17'U'
+  +'seMakrosCheckBox'#17'BorderSpacing.Top'#2#12#7'Caption'#6#17'UseMakrosCheck'
+  +'Box'#8'TabOrder'#2#5#22'AnchorSideLeft.Control'#7#10'EditButton'#21'AnchorS'
+  +'ideTop.Control'#7#10'EditButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#3'h'#1#6'Height'#2#24#3'Top'#2'x'#5'Width'#3#146#0#0#0#7'TButton'#17'In'
+  +'sertMacroButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2
+  +#6#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'
+  +#6#17'InsertMacroButton'#7'OnClick'#7#22'InsertMacroButtonClick'#8'TabOrder'
+  +#2#6#21'AnchorSideTop.Control'#7#17'UseMakrosCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#16'TemplateGroupBox'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#3'h'#1#6'Height'#2#30#3'Top'#3#156#0
+  +#5'Width'#2's'#0#0#0#7'TBitBtn'#12'CancelButton'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.Inn'
+  +'erBorder'#2#2#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'M'
+  +'odalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#2#23'AnchorSideRight.Control'
+  +#7#8'OkButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.S'
+  +'ide'#7#9'asrBottom'#4'Left'#3'i'#1#6'Height'#2#28#3'Top'#3#229#1#5'Width'#2
+  +'I'#0#0#7'TBitBtn'#8'OkButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Auto'
+  +'Size'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Ca'
+  +'ption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGly'
+  +'phs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#3#23'AnchorSideRight.'
+  +'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBo'
+  +'ttom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#184#1#6'Height'#2#28#3'Top'#3#229#1#5'Width'#2'3'#0#0#10'TSynPasSyn'#10'ASy'
+  +'nPasSyn'#7'Enabled'#8#4'left'#3#16#1#3'top'#2#24#0#0#0
 ]);
diff --git a/ide/codetemplatesdlg.pas b/ide/codetemplatesdlg.pas
index d30ff4798f..0084d4fcca 100644
--- a/ide/codetemplatesdlg.pas
+++ b/ide/codetemplatesdlg.pas
@@ -44,17 +44,16 @@ type
 
   TCodeTemplateDialog = class(TForm)
     AddButton: TButton;
+    OkButton: TBitBtn;
+    CancelButton: TBitBtn;
     InsertMacroButton: TButton;
     UseMakrosCheckBox: TCheckBox;
     EditButton: TButton;
     DeleteButton: TButton;
-    CancelButton: TButton;
     TemplateListBox: TListBox;
-    TemplateSplitter: TSplitter;
     TemplateSynEdit: TSynEdit;
     ASynPasSyn: TSynPasSyn;
     TemplateGroupBox: TGroupBox;
-    OkButton: TButton;
     FilenameButton: TButton;
     FilenameEdit: TEdit;
     FilenameGroupBox: TGroupBox;