ide: editor mouse action options

- use TButtonPanel instead of 2 TButton
  - fix layout (remove unneeded panel, reanchor everything)
  - fix taborder

git-svn-id: trunk@20362 -

ide/frames/editor_mouseaction_options_dlg.lfm

@@ -1,235 +1,204 @@
 object EditorMouseOptionsChangeDialog: TEditorMouseOptionsChangeDialog
-  Left = 120
+  Left = 647
-  Height = 151
+  Height = 175
-  Top = 586
+  Top = 463
-  Width = 399
+  Width = 346
   AutoSize = True
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'EditorMouseOptionsChangeDialog'
-  ClientHeight = 151
+  ClientHeight = 175
-  ClientWidth = 399
+  ClientWidth = 346
   OnCreate = FormCreate
   Position = poScreenCenter
   LCLVersion = '0.9.27'
-  object p3: TPanel
+  object BtnLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ButtonBox
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = ActionLabel
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 14
+    Top = 59
+    Width = 56
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 6
+    Caption = 'BtnLabel'
+    ParentColor = False
+  end
+  object ActionLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ActionBox
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 14
+    Top = 9
+    Width = 56
+    BorderSpacing.Left = 6
+    Caption = 'ActionLabel'
+    ParentColor = False
+  end
+  object CapturePanel: TPanel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ShiftCheck
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = BtnDefault
+    AnchorSideBottom.Control = BtnDefault
+    AnchorSideBottom.Side = asrBottom
+    Left = 6
+    Height = 23
+    Top = 106
+    Width = 251
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    BevelOuter = bvLowered
+    BevelWidth = 2
+    Color = clBtnShadow
+    ParentColor = False
+    TabOrder = 2
+    OnMouseDown = CapturePanelMouseDown
+  end
+  object ShiftCheck: TCheckBox
+    AnchorSideLeft.Control = ButtonBox
+    AnchorSideTop.Control = ButtonBox
+    AnchorSideTop.Side = asrBottom
+    Left = 68
+    Height = 17
+    Top = 83
+    Width = 69
+    AllowGrayed = True
+    BorderSpacing.Top = 6
+    Caption = 'ShiftCheck'
+    TabOrder = 6
+  end
+  object AltCheck: TCheckBox
+    AnchorSideLeft.Control = ShiftCheck
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ShiftCheck
+    AnchorSideTop.Side = asrCenter
+    Left = 143
+    Height = 17
+    Top = 83
+    Width = 60
+    AllowGrayed = True
+    BorderSpacing.Left = 6
+    Caption = 'AltCheck'
+    TabOrder = 7
+  end
+  object CtrlCheck: TCheckBox
+    AnchorSideLeft.Control = AltCheck
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ShiftCheck
+    AnchorSideTop.Side = asrCenter
+    Left = 209
+    Height = 17
+    Top = 83
+    Width = 64
+    AllowGrayed = True
+    BorderSpacing.Left = 6
+    Caption = 'CtrlCheck'
+    TabOrder = 8
+  end
+  object BtnDefault: TButton
+    AnchorSideLeft.Control = CtrlCheck
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ShiftCheck
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
-    Left = 0
+    Left = 263
-    Height = 145
+    Height = 23
-    Top = 0
+    Top = 106
-    Width = 393
+    Width = 77
-    Align = alClient
+    Anchors = [akTop, akRight]
     AutoSize = True
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
     BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
+    Caption = 'BtnDefault'
-    BevelOuter = bvNone
+    OnClick = BtnDefaultClick
-    BevelWidth = 3
+    TabOrder = 9
-    ClientHeight = 145
+  end
-    ClientWidth = 393
+  object DirCheck: TCheckBox
-    ParentColor = False
+    AnchorSideLeft.Control = ClickBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ClickBox
+    AnchorSideTop.Side = asrCenter
+    Left = 280
+    Height = 17
+    Top = 58
+    Width = 60
+    BorderSpacing.Around = 6
+    Caption = 'DirCheck'
+    TabOrder = 5
+  end
+  object ClickBox: TComboBox
+    AnchorSideLeft.Control = ButtonBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ButtonBox
+    Left = 174
+    Height = 21
+    Top = 56
+    Width = 100
+    BorderSpacing.Left = 6
+    ItemHeight = 13
+    Style = csDropDownList
+    TabOrder = 4
+  end
+  object ButtonBox: TComboBox
+    AnchorSideLeft.Control = BtnLabel
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = CaretCheck
+    AnchorSideTop.Side = asrBottom
+    Left = 68
+    Height = 21
+    Top = 56
+    Width = 100
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    ItemHeight = 13
+    Style = csDropDownList
+    TabOrder = 3
+  end
+  object CaretCheck: TCheckBox
+    AnchorSideLeft.Control = ActionBox
+    AnchorSideTop.Control = ActionBox
+    AnchorSideTop.Side = asrBottom
+    Left = 68
+    Height = 17
+    Top = 33
+    Width = 74
+    BorderSpacing.Top = 6
+    Caption = 'CaretCheck'
+    TabOrder = 1
+  end
+  object ActionBox: TComboBox
+    AnchorSideLeft.Control = ActionLabel
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Owner
+    Left = 68
+    Height = 21
+    Top = 6
+    Width = 196
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    ItemHeight = 13
+    Style = csDropDownList
     TabOrder = 0
-    object ActionLabel: TLabel
+  end
-      AnchorSideLeft.Control = p3
+  object ButtonPanel1: TButtonPanel
-      AnchorSideTop.Control = ActionBox
+    AnchorSideTop.Control = BtnDefault
-      AnchorSideTop.Side = asrCenter
+    AnchorSideTop.Side = asrBottom
-      Left = 6
+    Left = 6
-      Height = 16
+    Height = 34
-      Top = 9
+    Top = 135
-      Width = 64
+    Width = 334
-      BorderSpacing.Left = 6
+    Anchors = [akTop, akLeft, akRight, akBottom]
-      Caption = 'ActionLabel'
+    TabOrder = 10
-      ParentColor = False
+    ShowButtons = [pbOK, pbCancel]
-    end
-    object BtnLabel: TLabel
-      AnchorSideLeft.Control = p3
-      AnchorSideTop.Control = ButtonBox
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Control = ActionLabel
-      AnchorSideRight.Side = asrBottom
-      Left = 6
-      Height = 16
-      Top = 63
-      Width = 64
-      Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.Left = 6
-      Caption = 'BtnLabel'
-      ParentColor = False
-    end
-    object ActionBox: TComboBox
-      AnchorSideLeft.Control = ActionLabel
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = p3
-      Left = 76
-      Height = 23
-      Top = 6
-      Width = 196
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 6
-      ItemHeight = 15
-      Style = csDropDownList
-      TabOrder = 0
-    end
-    object ButtonBox: TComboBox
-      AnchorSideLeft.Control = BtnLabel
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = CaretCheck
-      AnchorSideTop.Side = asrBottom
-      Left = 76
-      Height = 23
-      Top = 60
-      Width = 100
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 6
-      ItemHeight = 15
-      Style = csDropDownList
-      TabOrder = 1
-    end
-    object ClickBox: TComboBox
-      AnchorSideLeft.Control = ButtonBox
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ButtonBox
-      Left = 182
-      Height = 23
-      Top = 60
-      Width = 100
-      BorderSpacing.Left = 6
-      ItemHeight = 15
-      Style = csDropDownList
-      TabOrder = 2
-    end
-    object DirCheck: TCheckBox
-      AnchorSideLeft.Control = ClickBox
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ClickBox
-      AnchorSideTop.Side = asrCenter
-      Left = 288
-      Height = 19
-      Top = 62
-      Width = 68
-      BorderSpacing.Left = 6
-      Caption = 'DirCheck'
-      TabOrder = 3
-    end
-    object ShiftCheck: TCheckBox
-      AnchorSideLeft.Control = ButtonBox
-      AnchorSideTop.Control = ButtonBox
-      AnchorSideTop.Side = asrBottom
-      Left = 76
-      Height = 19
-      Top = 89
-      Width = 77
-      AllowGrayed = True
-      BorderSpacing.Top = 6
-      Caption = 'ShiftCheck'
-      TabOrder = 4
-    end
-    object AltCheck: TCheckBox
-      AnchorSideLeft.Control = ShiftCheck
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ShiftCheck
-      AnchorSideTop.Side = asrCenter
-      Left = 159
-      Height = 19
-      Top = 89
-      Width = 68
-      AllowGrayed = True
-      BorderSpacing.Left = 6
-      Caption = 'AltCheck'
-      TabOrder = 5
-    end
-    object CtrlCheck: TCheckBox
-      AnchorSideLeft.Control = AltCheck
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ShiftCheck
-      AnchorSideTop.Side = asrCenter
-      Left = 233
-      Height = 19
-      Top = 89
-      Width = 72
-      AllowGrayed = True
-      BorderSpacing.Left = 6
-      Caption = 'CtrlCheck'
-      TabOrder = 6
-    end
-    object CancelButton: TButton
-      AnchorSideTop.Control = OkButton
-      AnchorSideRight.Control = p3
-      AnchorSideRight.Side = asrBottom
-      Left = 285
-      Height = 25
-      Top = 114
-      Width = 108
-      Anchors = [akTop, akRight]
-      Cancel = True
-      Caption = 'CancelButton'
-      ModalResult = 2
-      TabOrder = 7
-    end
-    object OkButton: TButton
-      AnchorSideTop.Control = ShiftCheck
-      AnchorSideTop.Side = asrBottom
-      AnchorSideRight.Control = CancelButton
-      Left = 173
-      Height = 25
-      Top = 114
-      Width = 100
-      Anchors = [akTop, akRight]
-      BorderSpacing.Top = 6
-      BorderSpacing.Right = 12
-      BorderSpacing.Bottom = 6
-      Caption = 'OkButton'
-      Default = True
-      ModalResult = 1
-      TabOrder = 8
-    end
-    object BtnDefault: TButton
-      AnchorSideLeft.Control = CtrlCheck
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ShiftCheck
-      AnchorSideBottom.Control = ShiftCheck
-      AnchorSideBottom.Side = asrBottom
-      Left = 311
-      Height = 19
-      Top = 89
-      Width = 82
-      Anchors = [akTop, akLeft, akBottom]
-      AutoSize = True
-      BorderSpacing.Left = 6
-      Caption = 'BtnDefault'
-      OnClick = BtnDefaultClick
-      TabOrder = 9
-    end
-    object CapturePanel: TPanel
-      AnchorSideLeft.Control = p3
-      AnchorSideTop.Control = OkButton
-      AnchorSideBottom.Control = OkButton
-      AnchorSideBottom.Side = asrBottom
-      Left = 6
-      Height = 25
-      Top = 114
-      Width = 100
-      Anchors = [akTop, akLeft, akBottom]
-      BorderSpacing.Left = 6
-      BorderSpacing.Right = 6
-      BevelOuter = bvLowered
-      BevelWidth = 2
-      Color = clBtnShadow
-      ParentColor = False
-      TabOrder = 10
-      OnMouseDown = CapturePanelMouseDown
-    end
-    object CaretCheck: TCheckBox
-      AnchorSideLeft.Control = ActionBox
-      AnchorSideTop.Control = ActionBox
-      AnchorSideTop.Side = asrBottom
-      Left = 76
-      Height = 19
-      Top = 35
-      Width = 81
-      BorderSpacing.Top = 6
-      Caption = 'CaretCheck'
-      TabOrder = 11
-    end
   end
 end

ide/frames/editor_mouseaction_options_dlg.lrs

@@ -2,79 +2,71 @@
 
 LazarusResources.Add('TEditorMouseOptionsChangeDialog','FORMDATA',[
   'TPF0'#31'TEditorMouseOptionsChangeDialog'#30'EditorMouseOptionsChangeDialog'
-  +#4'Left'#2'x'#6'Height'#3#151#0#3'Top'#3'J'#2#5'Width'#3#143#1#8'AutoSize'#9
+  +#4'Left'#3#135#2#6'Height'#3#175#0#3'Top'#3#207#1#5'Width'#3'Z'#1#8'AutoSize'
-  +#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Capti'
+  +#9#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Cap'
-  +'on'#6#30'EditorMouseOptionsChangeDialog'#12'ClientHeight'#3#151#0#11'Client'
+  +'tion'#6#30'EditorMouseOptionsChangeDialog'#12'ClientHeight'#3#175#0#11'Clie'
-  +'Width'#3#143#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'
+  +'ntWidth'#3'Z'#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCente'
-  +#10'LCLVersion'#6#6'0.9.27'#0#6'TPanel'#2'p3'#20'AnchorSideRight.Side'#7#9'a'
+  +'r'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#8'BtnLabel'#22'AnchorSideLeft.Con'
-  +'srBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3
+  +'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'ButtonBox'#18'AnchorSideTop.'
-  +#145#0#3'Top'#2#0#5'Width'#3#137#1#5'Align'#7#8'alClient'#8'AutoSize'#9#19'B'
+  +'Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'ActionLabel'#20'Ancho'
-  +'orderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#10'BevelOuter'#7#6'bvN'
+  +'rSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#14#3'Top'#2';'#5'Wi'
-  +'one'#10'BevelWidth'#2#3#12'ClientHeight'#3#145#0#11'ClientWidth'#3#137#1#11
+  +'dth'#2'8'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Le'
-  +'ParentColor'#8#8'TabOrder'#2#0#0#6'TLabel'#11'ActionLabel'#22'AnchorSideLef'
+  +'ft'#2#6#7'Caption'#6#8'BtnLabel'#11'ParentColor'#8#0#0#6'TLabel'#11'ActionL'
-  +'t.Control'#7#2'p3'#21'AnchorSideTop.Control'#7#9'ActionBox'#18'AnchorSideTo'
+  +'abel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'A'
-  +'p.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#16#3'Top'#2#9#5'Width'#2'@'
+  +'ctionBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3
-  +#18'BorderSpacing.Left'#2#6#7'Caption'#6#11'ActionLabel'#11'ParentColor'#8#0
+  +'Top'#2#9#5'Width'#2'8'#18'BorderSpacing.Left'#2#6#7'Caption'#6#11'ActionLab'
-  +#0#6'TLabel'#8'BtnLabel'#22'AnchorSideLeft.Control'#7#2'p3'#21'AnchorSideTop'
+  +'el'#11'ParentColor'#8#0#0#6'TPanel'#12'CapturePanel'#22'AnchorSideLeft.Cont'
-  +'.Control'#7#9'ButtonBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSid'
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#10'ShiftCheck'#18'AnchorSideTop'
-  +'eRight.Control'#7#11'ActionLabel'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#10'BtnDefault'#24'Ancho'
-  +'Left'#2#6#6'Height'#2#16#3'Top'#2'?'#5'Width'#2'@'#7'Anchors'#11#5'akTop'#6
+  +'rSideBottom.Control'#7#10'BtnDefault'#21'AnchorSideBottom.Side'#7#9'asrBott'
-  +'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#8'BtnLabel'#11
+  +'om'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'j'#5'Width'#3#251#0#7'Anchors'#11#5
-  +'ParentColor'#8#0#0#9'TComboBox'#9'ActionBox'#22'AnchorSideLeft.Control'#7#11
+  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'Bor'
-  +'ActionLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'derSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#10'BevelOuter'#7#9'bvLowere'
-  +'l'#7#2'p3'#4'Left'#2'L'#6'Height'#2#23#3'Top'#2#6#5'Width'#3#196#0#18'Borde'
+  +'d'#10'BevelWidth'#2#2#5'Color'#7#11'clBtnShadow'#11'ParentColor'#8#8'TabOrd'
-  +'rSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#15#5'Style'#7
+  +'er'#2#2#11'OnMouseDown'#7#21'CapturePanelMouseDown'#0#0#9'TCheckBox'#10'Shi'
-  +#14'csDropDownList'#8'TabOrder'#2#0#0#0#9'TComboBox'#9'ButtonBox'#22'AnchorS'
+  +'ftCheck'#22'AnchorSideLeft.Control'#7#9'ButtonBox'#21'AnchorSideTop.Control'
-  +'ideLeft.Control'#7#8'BtnLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'An'
+  +#7#9'ButtonBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'D'#6'Height'
-  +'chorSideTop.Control'#7#10'CaretCheck'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#2#17#3'Top'#2'S'#5'Width'#2'E'#11'AllowGrayed'#9#17'BorderSpacing.Top'#2#6#7
-  +#4'Left'#2'L'#6'Height'#2#23#3'Top'#2'<'#5'Width'#2'd'#18'BorderSpacing.Left'
+  +'Caption'#6#10'ShiftCheck'#8'TabOrder'#2#6#0#0#9'TCheckBox'#8'AltCheck'#22'A'
-  +#2#6#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#15#5'Style'#7#14'csDropDownL'
+  +'nchorSideLeft.Control'#7#10'ShiftCheck'#19'AnchorSideLeft.Side'#7#9'asrBott'
-  +'ist'#8'TabOrder'#2#1#0#0#9'TComboBox'#8'ClickBox'#22'AnchorSideLeft.Control'
+  +'om'#21'AnchorSideTop.Control'#7#10'ShiftCheck'#18'AnchorSideTop.Side'#7#9'a'
-  +#7#9'ButtonBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
+  +'srCenter'#4'Left'#3#143#0#6'Height'#2#17#3'Top'#2'S'#5'Width'#2'<'#11'Allow'
-  +'rol'#7#9'ButtonBox'#4'Left'#3#182#0#6'Height'#2#23#3'Top'#2'<'#5'Width'#2'd'
+  +'Grayed'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#8'AltCheck'#8'TabOrder'#2
-  +#18'BorderSpacing.Left'#2#6#10'ItemHeight'#2#15#5'Style'#7#14'csDropDownList'
+  +#7#0#0#9'TCheckBox'#9'CtrlCheck'#22'AnchorSideLeft.Control'#7#8'AltCheck'#19
-  +#8'TabOrder'#2#2#0#0#9'TCheckBox'#8'DirCheck'#22'AnchorSideLeft.Control'#7#8
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'ShiftChe'
-  +'ClickBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
+  +'ck'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#209#0#6'Height'#2#17#3
-  +#8'ClickBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3' '#1#6'Height'#2
+  +'Top'#2'S'#5'Width'#2'@'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#7'Capt'
-  +#19#3'Top'#2'>'#5'Width'#2'D'#18'BorderSpacing.Left'#2#6#7'Caption'#6#8'DirC'
+  +'ion'#6#9'CtrlCheck'#8'TabOrder'#2#8#0#0#7'TButton'#10'BtnDefault'#22'Anchor'
-  +'heck'#8'TabOrder'#2#3#0#0#9'TCheckBox'#10'ShiftCheck'#22'AnchorSideLeft.Con'
+  +'SideLeft.Control'#7#9'CtrlCheck'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'trol'#7#9'ButtonBox'#21'AnchorSideTop.Control'#7#9'ButtonBox'#18'AnchorSide'
+  +'AnchorSideTop.Control'#7#10'ShiftCheck'#18'AnchorSideTop.Side'#7#9'asrBotto'
-  +'Top.Side'#7#9'asrBottom'#4'Left'#2'L'#6'Height'#2#19#3'Top'#2'Y'#5'Width'#2
+  +'m'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrB'
-  +'M'#11'AllowGrayed'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#10'ShiftCheck'#8
+  +'ottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#7#1#6'Height'#2#23
-  +'TabOrder'#2#4#0#0#9'TCheckBox'#8'AltCheck'#22'AnchorSideLeft.Control'#7#10
+  +#3'Top'#2'j'#5'Width'#2'M'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9
-  +'ShiftCheck'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'
-  +#7#10'ShiftCheck'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#159#0#6'He'
+  +#2#6#7'Caption'#6#10'BtnDefault'#7'OnClick'#7#15'BtnDefaultClick'#8'TabOrder'
-  +'ight'#2#19#3'Top'#2'Y'#5'Width'#2'D'#11'AllowGrayed'#9#18'BorderSpacing.Lef'
+  +#2#9#0#0#9'TCheckBox'#8'DirCheck'#22'AnchorSideLeft.Control'#7#8'ClickBox'#19
-  +'t'#2#6#7'Caption'#6#8'AltCheck'#8'TabOrder'#2#5#0#0#9'TCheckBox'#9'CtrlChec'
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#8'ClickBox'
-  +'k'#22'AnchorSideLeft.Control'#7#8'AltCheck'#19'AnchorSideLeft.Side'#7#9'asr'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#24#1#6'Height'#2#17#3'Top'#2
-  +'Bottom'#21'AnchorSideTop.Control'#7#10'ShiftCheck'#18'AnchorSideTop.Side'#7
+  +':'#5'Width'#2'<'#20'BorderSpacing.Around'#2#6#7'Caption'#6#8'DirCheck'#8'Ta'
-  +#9'asrCenter'#4'Left'#3#233#0#6'Height'#2#19#3'Top'#2'Y'#5'Width'#2'H'#11'Al'
+  +'bOrder'#2#5#0#0#9'TComboBox'#8'ClickBox'#22'AnchorSideLeft.Control'#7#9'But'
-  +'lowGrayed'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#9'CtrlCheck'#8'TabOrde'
+  +'tonBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9
-  +'r'#2#6#0#0#7'TButton'#12'CancelButton'#21'AnchorSideTop.Control'#7#8'OkButt'
+  +'ButtonBox'#4'Left'#3#174#0#6'Height'#2#21#3'Top'#2'8'#5'Width'#2'd'#18'Bord'
-  +'on'#23'AnchorSideRight.Control'#7#2'p3'#20'AnchorSideRight.Side'#7#9'asrBot'
+  +'erSpacing.Left'#2#6#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownList'#8'Tab'
-  +'tom'#4'Left'#3#29#1#6'Height'#2#25#3'Top'#2'r'#5'Width'#2'l'#7'Anchors'#11#5
+  +'Order'#2#4#0#0#9'TComboBox'#9'ButtonBox'#22'AnchorSideLeft.Control'#7#8'Btn'
-  +'akTop'#7'akRight'#0#6'Cancel'#9#7'Caption'#6#12'CancelButton'#11'ModalResul'
+  +'Label'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10
-  +'t'#2#2#8'TabOrder'#2#7#0#0#7'TButton'#8'OkButton'#21'AnchorSideTop.Control'
+  +'CaretCheck'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'D'#6'Height'#2
-  +#7#10'ShiftCheck'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.C'
+  +#21#3'Top'#2'8'#5'Width'#2'd'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.To'
-  +'ontrol'#7#12'CancelButton'#4'Left'#3#173#0#6'Height'#2#25#3'Top'#2'r'#5'Wid'
+  +'p'#2#6#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#3#0#0
-  +'th'#2'd'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'B'
+  +#9'TCheckBox'#10'CaretCheck'#22'AnchorSideLeft.Control'#7#9'ActionBox'#21'An'
-  +'orderSpacing.Right'#2#12#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#8'OkButt'
+  +'chorSideTop.Control'#7#9'ActionBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'on'#7'Default'#9#11'ModalResult'#2#1#8'TabOrder'#2#8#0#0#7'TButton'#10'BtnD'
+  +'Left'#2'D'#6'Height'#2#17#3'Top'#2'!'#5'Width'#2'J'#17'BorderSpacing.Top'#2
-  +'efault'#22'AnchorSideLeft.Control'#7#9'CtrlCheck'#19'AnchorSideLeft.Side'#7
+  +#6#7'Caption'#6#10'CaretCheck'#8'TabOrder'#2#1#0#0#9'TComboBox'#9'ActionBox'
-  +#9'asrBottom'#21'AnchorSideTop.Control'#7#10'ShiftCheck'#24'AnchorSideBottom'
+  +#22'AnchorSideLeft.Control'#7#11'ActionLabel'#19'AnchorSideLeft.Side'#7#9'as'
-  +'.Control'#7#10'ShiftCheck'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
+  +'rBottom'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2'D'#6'Height'#2#21#3
-  +#3'7'#1#6'Height'#2#19#3'Top'#2'Y'#5'Width'#2'R'#7'Anchors'#11#5'akTop'#6'ak'
+  +'Top'#2#6#5'Width'#3#196#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
-  +'Left'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#10
+  +#6#10'ItemHeight'#2#13#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#12
-  ,'BtnDefault'#7'OnClick'#7#15'BtnDefaultClick'#8'TabOrder'#2#9#0#0#6'TPanel'
+  ,'TButtonPanel'#12'ButtonPanel1'#21'AnchorSideTop.Control'#7#10'BtnDefault'#18
-  +#12'CapturePanel'#22'AnchorSideLeft.Control'#7#2'p3'#21'AnchorSideTop.Contro'
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'"'#3'Top'#3#135#0
-  +'l'#7#8'OkButton'#24'AnchorSideBottom.Control'#7#8'OkButton'#21'AnchorSideBo'
+  +#5'Width'#3'N'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8
-  +'ttom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'r'#5'Width'#2
+  +'TabOrder'#2#10#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#0#0#0
-  +'d'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6
-  +#19'BorderSpacing.Right'#2#6#10'BevelOuter'#7#9'bvLowered'#10'BevelWidth'#2#2
-  +#5'Color'#7#11'clBtnShadow'#11'ParentColor'#8#8'TabOrder'#2#10#11'OnMouseDow'
-  +'n'#7#21'CapturePanelMouseDown'#0#0#9'TCheckBox'#10'CaretCheck'#22'AnchorSid'
-  +'eLeft.Control'#7#9'ActionBox'#21'AnchorSideTop.Control'#7#9'ActionBox'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'L'#6'Height'#2#19#3'Top'#2'#'#5
-  +'Width'#2'Q'#17'BorderSpacing.Top'#2#6#7'Caption'#6#10'CaretCheck'#8'TabOrde'
-  +'r'#2#11#0#0#0#0
 ]);

ide/frames/editor_mouseaction_options_dlg.pas

@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, SynEditMouseCmds, LazarusIDEStrConsts;
+  StdCtrls, ButtonPanel, SynEditMouseCmds, LazarusIDEStrConsts;
 
 const
   ButtonName: Array [TMouseButton] of String =
@@ -23,19 +23,17 @@ type
   TEditorMouseOptionsChangeDialog = class(TForm)
     ActionBox: TComboBox;
     ActionLabel: TLabel;
-    CancelButton: TButton;
     AltCheck: TCheckBox;
     BtnDefault: TButton;
     BtnLabel: TLabel;
     ButtonBox: TComboBox;
+    ButtonPanel1: TButtonPanel;
     CaretCheck: TCheckBox;
     ClickBox: TComboBox;
     CtrlCheck: TCheckBox;
     DirCheck: TCheckBox;
-    p3: TPanel;
     CapturePanel: TPanel;
     ShiftCheck: TCheckBox;
-    OkButton: TButton;
     procedure BtnDefaultClick(Sender: TObject);
     procedure CapturePanelMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState;
       X, Y: Integer);
@@ -85,8 +83,6 @@ begin
   ShiftCheck.Caption := dlgMouseOptModShift;
   AltCheck.Caption   := dlgMouseOptModAlt;
   CtrlCheck.Caption  := dlgMouseOptModCtrl;
-  OkButton.Caption     := dlgMouseOptBtnOk;
-  CancelButton.Caption := dlgMouseOptBtnCancel;
 end;
 
 procedure TEditorMouseOptionsChangeDialog.ResetInputs;