designer: change more dialogs to have button panel instead of ok, cancel buttons

git-svn-id: trunk@19732 -

designer/changeclassdialog.lfm

@@ -10,17 +10,16 @@ object ChangeClassDlg: TChangeClassDlg
   ClientHeight = 350
   ClientWidth = 470
   OnCreate = ChangeClassDlgCreate
-  ParentFont = False
+  LCLVersion = '0.9.27'
-  LCLVersion = '0.9.25'
   object OldGroupBox: TGroupBox
     Left = 6
-    Height = 300
+    Height = 306
     Top = 6
     Width = 228
     Align = alClient
     BorderSpacing.Around = 6
     Caption = 'OldGroupBox'
-    ClientHeight = 282
+    ClientHeight = 288
     ClientWidth = 224
     TabOrder = 0
     object OldClassLabel: TLabel
@@ -34,34 +33,38 @@ object ChangeClassDlg: TChangeClassDlg
     object OldAncestorGroupBox: TGroupBox
       AnchorSideTop.Control = OldClassLabel
       AnchorSideTop.Side = asrBottom
-      Height = 260
+      Left = 0
+      Height = 266
       Top = 22
       Width = 224
       Align = alBottom
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Top = 6
       Caption = 'OldAncestorGroupBox'
-      ClientHeight = 242
+      ClientHeight = 248
       ClientWidth = 220
       TabOrder = 0
       object OldAncestorsListBox: TListBox
-        Height = 242
+        Left = 0
+        Height = 248
+        Top = 0
         Width = 220
         Align = alClient
         ClickOnSelChange = False
+        ItemHeight = 0
         TabOrder = 0
       end
     end
   end
   object NewGroupBox: TGroupBox
     Left = 240
-    Height = 300
+    Height = 306
     Top = 6
     Width = 224
     Align = alRight
     BorderSpacing.Around = 6
     Caption = 'NewGroupBox'
-    ClientHeight = 282
+    ClientHeight = 288
     ClientWidth = 220
     TabOrder = 1
     object NewClassComboBox: TComboBox
@@ -74,72 +77,40 @@ object ChangeClassDlg: TChangeClassDlg
       AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchAscending]
       BorderSpacing.Around = 6
       ItemHeight = 13
-      MaxLength = -1
+      ItemWidth = 0
       OnEditingDone = NewClassComboBoxEditingDone
       TabOrder = 0
       Text = 'NewClassComboBox'
     end
     object NewAncestorGroupBox: TGroupBox
-      Height = 249
+      Left = 0
+      Height = 255
       Top = 33
       Width = 220
       Align = alClient
       Caption = 'NewAncestorGroupBox'
-      ClientHeight = 231
+      ClientHeight = 237
       ClientWidth = 216
       TabOrder = 1
       object NewAncestorsListBox: TListBox
-        Height = 231
+        Left = 0
+        Height = 237
+        Top = 0
         Width = 216
         Align = alClient
         ClickOnSelChange = False
+        ItemHeight = 0
         TabOrder = 0
       end
     end
   end
-  object BtnPanel: TPanel
+  object BtnPanel: TButtonPanel
-    Height = 38
+    Left = 6
-    Top = 312
+    Height = 26
-    Width = 470
+    Top = 318
-    Align = alBottom
+    Width = 458
-    AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 38
-    ClientWidth = 470
     TabOrder = 2
-    object CancelButton: TBitBtn
+    ShowButtons = [pbOK, pbCancel]
-      AnchorSideRight.Side = asrBottom
+    ShowBevel = False
-      AnchorSideBottom.Side = asrBottom
-      Left = 389
-      Height = 26
-      Top = 6
-      Width = 75
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Cancel = True
-      Caption = 'Cancel'
-      Constraints.MinWidth = 75
-      Kind = bkCancel
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object OkButton: TBitBtn
-      AnchorSideBottom.Side = asrBottom
-      Left = 308
-      Height = 26
-      Top = 6
-      Width = 75
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = '&OK'
-      Constraints.MinWidth = 75
-      Kind = bkOK
-      ModalResult = 1
-      NumGlyphs = 0
-      TabOrder = 1
-    end
   end
 end

designer/changeclassdialog.lrs

@@ -5,42 +5,34 @@ LazarusResources.Add('TChangeClassDlg','FORMDATA',[
   +#3'Top'#3#163#0#5'Width'#3#214#1#13'ActiveControl'#7#19'OldAncestorsListBox'
   +#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#0#11'BorderStyle'#7#12'b'
   +'sToolWindow'#7'Caption'#6#14'ChangeClassDlg'#12'ClientHeight'#3'^'#1#11'Cli'
-  +'entWidth'#3#214#1#8'OnCreate'#7#20'ChangeClassDlgCreate'#10'ParentFont'#8#10
+  +'entWidth'#3#214#1#8'OnCreate'#7#20'ChangeClassDlgCreate'#10'LCLVersion'#6#6
-  +'LCLVersion'#6#6'0.9.25'#0#9'TGroupBox'#11'OldGroupBox'#4'Left'#2#6#6'Height'
+  +'0.9.27'#0#9'TGroupBox'#11'OldGroupBox'#4'Left'#2#6#6'Height'#3'2'#1#3'Top'#2
-  +#3','#1#3'Top'#2#6#5'Width'#3#228#0#5'Align'#7#8'alClient'#20'BorderSpacing.'
+  +#6#5'Width'#3#228#0#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'Around'#2#6#7'Caption'#6#11'OldGroupBox'#12'ClientHeight'#3#26#1#11'ClientW'
+  +'ption'#6#11'OldGroupBox'#12'ClientHeight'#3' '#1#11'ClientWidth'#3#224#0#8
-  +'idth'#3#224#0#8'TabOrder'#2#0#0#6'TLabel'#13'OldClassLabel'#4'Left'#2#6#6'H'
+  +'TabOrder'#2#0#0#6'TLabel'#13'OldClassLabel'#4'Left'#2#6#6'Height'#2#14#3'To'
-  +'eight'#2#14#3'Top'#2#2#5'Width'#2'C'#7'Caption'#6#13'OldClassLabel'#11'Pare'
+  +'p'#2#2#5'Width'#2'C'#7'Caption'#6#13'OldClassLabel'#11'ParentColor'#8#0#0#9
-  +'ntColor'#8#0#0#9'TGroupBox'#19'OldAncestorGroupBox'#21'AnchorSideTop.Contro'
+  +'TGroupBox'#19'OldAncestorGroupBox'#21'AnchorSideTop.Control'#7#13'OldClassL'
-  +'l'#7#13'OldClassLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#4#1
+  +'abel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#10#1#3
-  +#3'Top'#2#22#5'Width'#3#224#0#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6
+  +'Top'#2#22#5'Width'#3#224#0#5'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6
   +'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#19
-  +'OldAncestorGroupBox'#12'ClientHeight'#3#242#0#11'ClientWidth'#3#220#0#8'Tab'
+  +'OldAncestorGroupBox'#12'ClientHeight'#3#248#0#11'ClientWidth'#3#220#0#8'Tab'
-  +'Order'#2#0#0#8'TListBox'#19'OldAncestorsListBox'#6'Height'#3#242#0#5'Width'
+  +'Order'#2#0#0#8'TListBox'#19'OldAncestorsListBox'#4'Left'#2#0#6'Height'#3#248
-  +#3#220#0#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8#8'TabOrder'#2#0#0#0#0
+  +#0#3'Top'#2#0#5'Width'#3#220#0#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8
-  +#0#9'TGroupBox'#11'NewGroupBox'#4'Left'#3#240#0#6'Height'#3','#1#3'Top'#2#6#5
+  +#10'ItemHeight'#2#0#8'TabOrder'#2#0#0#0#0#0#9'TGroupBox'#11'NewGroupBox'#4'L'
-  +'Width'#3#224#0#5'Align'#7#7'alRight'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +'eft'#3#240#0#6'Height'#3'2'#1#3'Top'#2#6#5'Width'#3#224#0#5'Align'#7#7'alRi'
-  +#6#11'NewGroupBox'#12'ClientHeight'#3#26#1#11'ClientWidth'#3#220#0#8'TabOrde'
+  +'ght'#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'NewGroupBox'#12'ClientHei'
-  +'r'#2#1#0#9'TComboBox'#16'NewClassComboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'
+  +'ght'#3' '#1#11'ClientWidth'#3#220#0#8'TabOrder'#2#1#0#9'TComboBox'#16'NewCl'
-  +#2#6#5'Width'#3#208#0#5'Align'#7#5'alTop'#12'AutoComplete'#9#16'AutoComplete'
+  +'assComboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3#208#0#5'Align'
-  +'Text'#11#12'cbactEnabled'#22'cbactEndOfLineComplete'#20'cbactSearchAscendin'
+  +#7#5'alTop'#12'AutoComplete'#9#16'AutoCompleteText'#11#12'cbactEnabled'#22'c'
-  +'g'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#9'MaxLength'#2#255#13
+  +'bactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2
-  +'OnEditingDone'#7#27'NewClassComboBoxEditingDone'#8'TabOrder'#2#0#4'Text'#6
+  +#6#10'ItemHeight'#2#13#9'ItemWidth'#2#0#13'OnEditingDone'#7#27'NewClassCombo'
-  +#16'NewClassComboBox'#0#0#9'TGroupBox'#19'NewAncestorGroupBox'#6'Height'#3
+  +'BoxEditingDone'#8'TabOrder'#2#0#4'Text'#6#16'NewClassComboBox'#0#0#9'TGroup'
-  +#249#0#3'Top'#2'!'#5'Width'#3#220#0#5'Align'#7#8'alClient'#7'Caption'#6#19'N'
+  +'Box'#19'NewAncestorGroupBox'#4'Left'#2#0#6'Height'#3#255#0#3'Top'#2'!'#5'Wi'
-  +'ewAncestorGroupBox'#12'ClientHeight'#3#231#0#11'ClientWidth'#3#216#0#8'TabO'
+  +'dth'#3#220#0#5'Align'#7#8'alClient'#7'Caption'#6#19'NewAncestorGroupBox'#12
-  +'rder'#2#1#0#8'TListBox'#19'NewAncestorsListBox'#6'Height'#3#231#0#5'Width'#3
+  +'ClientHeight'#3#237#0#11'ClientWidth'#3#216#0#8'TabOrder'#2#1#0#8'TListBox'
-  +#216#0#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8#8'TabOrder'#2#0#0#0#0#0
+  +#19'NewAncestorsListBox'#4'Left'#2#0#6'Height'#3#237#0#3'Top'#2#0#5'Width'#3
-  +#6'TPanel'#8'BtnPanel'#6'Height'#2'&'#3'Top'#3'8'#1#5'Width'#3#214#1#5'Align'
+  +#216#0#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8#10'ItemHeight'#2#0#8'Ta'
-  +#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'
+  +'bOrder'#2#0#0#0#0#0#12'TButtonPanel'#8'BtnPanel'#4'Left'#2#6#6'Height'#2#26
-  +#11'ClientWidth'#3#214#1#8'TabOrder'#2#2#0#7'TBitBtn'#12'CancelButton'#20'An'
+  +#3'Top'#3'>'#1#5'Width'#3#202#1#8'TabOrder'#2#2#11'ShowButtons'#11#4'pbOK'#8
-  +'chorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'
+  +'pbCancel'#0#9'ShowBevel'#8#0#0#0
-  +#4'Left'#3#133#1#6'Height'#2#26#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRigh'
-  +'t'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Ca'
-  +'ncel'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2
-  +#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'OkButton'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3'4'#1#6'Height'#2#26#3'Top'#2#6#5'Widt'
-  +'h'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#4'bkOK'#11'ModalR'
-  +'esult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#0
 ]);

designer/changeclassdialog.pas

@@ -39,15 +39,14 @@ uses
   StdCtrls, Buttons, AVGLvlTree, LFMTrees, CodeCache, CodeToolManager,
   // IDE
   SrcEditorIntf, PropEdits, LazarusIDEStrConsts, ComponentReg, ComponentEditors,
-  FormEditingIntf, CheckLFMDlg, Project, MainIntf, ExtCtrls;
+  FormEditingIntf, CheckLFMDlg, Project, MainIntf, ExtCtrls, ButtonPanel;
 
 type
 
   { TChangeClassDlg }
 
   TChangeClassDlg = class(TForm)
-    OkButton: TBitBtn;
+    BtnPanel: TButtonPanel;
-    CancelButton: TBitBtn;
     NewClassComboBox: TComboBox;
     NewAncestorGroupBox: TGroupBox;
     NewAncestorsListBox: TListBox;
@@ -56,7 +55,6 @@ type
     OldClassLabel: TLabel;
     NewGroupBox: TGroupBox;
     OldGroupBox: TGroupBox;
-    BtnPanel: TPanel;
     procedure ChangeClassDlgCreate(Sender: TObject);
     procedure NewClassComboBoxEditingDone(Sender: TObject);
   private
@@ -305,10 +303,8 @@ begin
   NewGroupBox.Caption:=lisNewClass;
   OldAncestorGroupBox.Caption:=lisOldAncestors;
   NewAncestorGroupBox.Caption:=lisNewAncestors;
-  OkButton.Caption:=lisLazBuildOk;
+  BtnPanel.OkButton.Caption := lisOkBtn;
-  CancelButton.Caption:=dlgCancel;
+  BtnPanel.CancelButton.Caption := dlgCancel;
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
 end;
 
 procedure TChangeClassDlg.NewClassComboBoxEditingDone(Sender: TObject);

designer/scalecompsdlg.lfm

@@ -1,14 +1,13 @@
 object ScaleComponentsDialog: TScaleComponentsDialog
-  Left = 372
+  Left = 642
-  Height = 82
+  Height = 87
-  Top = 698
+  Top = 378
-  Width = 258
+  Width = 256
-  ActiveControl = OKButton
   BorderIcons = [biSystemMenu, biMinimize]
   BorderStyle = bsToolWindow
   Caption = 'ScaleComponentsDialog'
-  ClientHeight = 82
+  ClientHeight = 87
-  ClientWidth = 258
+  ClientWidth = 256
   Position = poScreenCenter
   LCLVersion = '0.9.27'
   object PercentLabel: TLabel
@@ -16,7 +15,7 @@ object ScaleComponentsDialog: TScaleComponentsDialog
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 189
+    Left = 187
     Height = 14
     Top = 10
     Width = 63
@@ -26,60 +25,23 @@ object ScaleComponentsDialog: TScaleComponentsDialog
     ParentColor = False
   end
   object ScaleLabel: TLabel
+    AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = PercentEdit
     AnchorSideTop.Side = asrCenter
-    Left = 8
+    Left = 6
     Height = 14
     Top = 10
     Width = 51
+    BorderSpacing.Left = 6
     Caption = 'ScaleLabel'
     ParentColor = False
   end
-  object OKButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 110
-    Height = 26
-    Top = 50
-    Width = 59
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
-    Caption = '&OK'
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
-    TabOrder = 0
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 175
-    Height = 26
-    Top = 50
-    Width = 77
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 1
-  end
   object PercentEdit: TEdit
     AnchorSideLeft.Control = ScaleLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = PercentLabel
-    Left = 65
+    Left = 63
     Height = 23
     Top = 6
     Width = 118
@@ -87,7 +49,17 @@ object ScaleComponentsDialog: TScaleComponentsDialog
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     BorderSpacing.Right = 6
-    TabOrder = 2
+    TabOrder = 0
     Text = 'PercentEdit'
   end
+  object ButtonPanel1: TButtonPanel
+    AnchorSideTop.Control = PercentEdit
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 34
+    Top = 47
+    Width = 244
+    TabOrder = 1
+    ShowButtons = [pbOK, pbCancel]
+  end
 end

designer/scalecompsdlg.lrs

@@ -1,34 +1,26 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TScaleComponentsDialog','FORMDATA',[
-  'TPF0'#22'TScaleComponentsDialog'#21'ScaleComponentsDialog'#4'Left'#3't'#1#6
+  'TPF0'#22'TScaleComponentsDialog'#21'ScaleComponentsDialog'#4'Left'#3#130#2#6
-  +'Height'#2'R'#3'Top'#3#186#2#5'Width'#3#2#1#13'ActiveControl'#7#8'OKButton'
+  +'Height'#2'W'#3'Top'#3'z'#1#5'Width'#3#0#1#11'BorderIcons'#11#12'biSystemMen'
-  +#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#0#11'BorderStyle'#7#12'b'
+  +'u'#10'biMinimize'#0#11'BorderStyle'#7#12'bsToolWindow'#7'Caption'#6#21'Scal'
-  +'sToolWindow'#7'Caption'#6#21'ScaleComponentsDialog'#12'ClientHeight'#2'R'#11
+  +'eComponentsDialog'#12'ClientHeight'#2'W'#11'ClientWidth'#3#0#1#8'Position'#7
-  +'ClientWidth'#3#2#1#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.'
+  +#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#12'PercentLabel'
-  +'27'#0#6'TLabel'#12'PercentLabel'#21'AnchorSideTop.Control'#7#11'PercentEdit'
+  +#21'AnchorSideTop.Control'#7#11'PercentEdit'#18'AnchorSideTop.Side'#7#9'asrC'
-  +#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'
+  +'enter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#189#0#6'Height'#2#14#3'To'
+  +'asrBottom'#4'Left'#3#187#0#6'Height'#2#14#3'Top'#2#10#5'Width'#2'?'#7'Ancho'
-  +'p'#2#10#5'Width'#2'?'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.'
+  +'rs'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'Pe'
-  +'Right'#2#6#7'Caption'#6#12'PercentLabel'#11'ParentColor'#8#0#0#6'TLabel'#10
+  +'rcentLabel'#11'ParentColor'#8#0#0#6'TLabel'#10'ScaleLabel'#22'AnchorSideLef'
-  +'ScaleLabel'#21'AnchorSideTop.Control'#7#11'PercentEdit'#18'AnchorSideTop.Si'
+  +'t.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#11'PercentEdit'#18'Anchor'
-  +'de'#7#9'asrCenter'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#10#5'Width'#2'3'#7'C'
+  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#10#5'Width'
-  +'aption'#6#10'ScaleLabel'#11'ParentColor'#8#0#0#7'TBitBtn'#8'OKButton'#23'An'
+  +#2'3'#18'BorderSpacing.Left'#2#6#7'Caption'#6#10'ScaleLabel'#11'ParentColor'
-  +'chorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5
+  +#8#0#0#5'TEdit'#11'PercentEdit'#22'AnchorSideLeft.Control'#7#10'ScaleLabel'
-  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'n'#6'Height'#2#26
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'
-  +#3'Top'#2'2'#5'Width'#2';'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'
+  +#23'AnchorSideRight.Control'#7#12'PercentLabel'#4'Left'#2'?'#6'Height'#2#23#3
-  +#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#3'&'
+  +'Top'#2#6#5'Width'#2'v'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Bor'
-  +'OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'T'
+  +'derSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8
-  +'abOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5
+  +'TabOrder'#2#0#4'Text'#6#11'PercentEdit'#0#0#12'TButtonPanel'#12'ButtonPanel'
-  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
+  +'1'#21'AnchorSideTop.Control'#7#11'PercentEdit'#18'AnchorSideTop.Side'#7#9'a'
-  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#175#0#6'Heigh'
+  +'srBottom'#4'Left'#2#6#6'Height'#2'"'#3'Top'#2'/'#5'Width'#3#244#0#8'TabOrde'
-  +'t'#2#26#3'Top'#2'2'#5'Width'#2'M'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8
+  +'r'#2#1#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#0#0#0
-  +'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#6'Canc'
-  +'el'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'Nu'
-  +'mGlyphs'#2#0#8'TabOrder'#2#1#0#0#5'TEdit'#11'PercentEdit'#22'AnchorSideLeft'
-  +'.Control'#7#10'ScaleLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anchor'
-  +'SideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#12'PercentLabel'#4
-  +'Left'#2'A'#6'Height'#2#23#3'Top'#2#6#5'Width'#2'v'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19
-  +'BorderSpacing.Right'#2#6#8'TabOrder'#2#2#4'Text'#6#11'PercentEdit'#0#0#0
 ]);

designer/scalecompsdlg.pp

@@ -31,15 +31,17 @@ interface
 
 uses
   Classes, SysUtils, LCLIntf, LCLProc, Forms, Controls, Buttons, StdCtrls,
-  ExtCtrls, LResources, LazarusIDEStrConsts;
+  ExtCtrls, LResources, LazarusIDEStrConsts, ButtonPanel;
 
 type
+
+  { TScaleComponentsDialog }
+
   TScaleComponentsDialog = class(TForm)
+    ButtonPanel1: TButtonPanel;
     ScaleLabel: TLabel;
     PercentEdit: TEdit;
     PercentLabel: TLabel;
-    OkButton: TBitBtn;
-    CancelButton: TBitBtn;
   public
     constructor Create(AOwner: TComponent);  override;
   end;
@@ -49,10 +51,12 @@ function ShowScaleComponentsDialog(var ScaleInPercent: integer): TModalResult;
 implementation
 
 function ShowScaleComponentsDialog(var ScaleInPercent: integer): TModalResult;
-var ScaleComponentsDialog: TScaleComponentsDialog;
+var
+  ScaleComponentsDialog: TScaleComponentsDialog;
 begin
   ScaleComponentsDialog:=TScaleComponentsDialog.Create(nil);
-  with ScaleComponentsDialog do begin
+  with ScaleComponentsDialog do
+  begin
     PercentEdit.Text:='100';
     Result:=ShowModal;
     ScaleInPercent:=StrToIntDef(ScaleComponentsDialog.PercentEdit.Text,100);
@@ -66,15 +70,13 @@ constructor TScaleComponentsDialog.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
 
-  Caption:=fdmScaleWord;
+  Caption := fdmScaleWord;
 
-  ScaleLabel.Caption:=lisScalingFactor;
+  ScaleLabel.Caption := lisScalingFactor;
-  PercentLabel.Caption:='%';
+  PercentLabel.Caption := '%';
 
-  OkButton.Caption:=dlgButApply;
+  ButtonPanel1.OkButton.Caption := lisOkBtn;
-  CancelButton.Caption:=dlgCancel;
+  ButtonPanel1.CancelButton.Caption := dlgCancel;
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
 end;
 
 initialization

designer/sizecompsdlg.lfm

@@ -1,67 +1,40 @@
 object SizeComponentsDialog: TSizeComponentsDialog
-  Left = 379
+  Left = 668
   Height = 190
-  Top = 745
+  Top = 400
   Width = 380
-  ActiveControl = OKButton
   BorderStyle = bsSizeToolWin
   Caption = 'SizeComponentsDialog'
   ClientHeight = 190
   ClientWidth = 380
   OnClose = FormClose
-  OnResize = FormResize
   Position = poScreenCenter
   LCLVersion = '0.9.27'
-  object OKButton: TBitBtn
+  object PosLabel: TLabel
-    AnchorSideRight.Control = CancelButton
+    AnchorSideLeft.Control = Owner
-    AnchorSideBottom.Control = Owner
+    AnchorSideLeft.Side = asrCenter
-    AnchorSideBottom.Side = asrBottom
+    AnchorSideTop.Control = Owner
-    Left = 232
+    Left = 190
-    Height = 26
+    Height = 14
-    Top = 158
+    Top = 0
-    Width = 59
+    Width = 1
-    Anchors = [akRight, akBottom]
+    ParentColor = False
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
-    Caption = '&OK'
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
-    TabOrder = 0
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 297
-    Height = 26
-    Top = 158
-    Width = 77
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 1
   end
   object WidthRadioGroup: TRadioGroup
     AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = PosLabel
     AnchorSideBottom.Control = HeightRadioGroup
     AnchorSideBottom.Side = asrBottom
     Left = 6
     Height = 146
     Top = 6
     Width = 181
-    Anchors = [akTop, akLeft, akBottom]
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
     BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 3
     Caption = 'WidthRadioGroup'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -73,7 +46,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
     ChildSizing.ControlsPerLine = 1
     ClientHeight = 128
     ClientWidth = 177
-    TabOrder = 2
+    TabOrder = 0
     object WidthEdit: TEdit
       AnchorSideBottom.Control = WidthRadioGroup
       AnchorSideBottom.Side = asrBottom
@@ -88,16 +61,20 @@ object SizeComponentsDialog: TSizeComponentsDialog
     end
   end
   object HeightRadioGroup: TRadioGroup
+    AnchorSideLeft.Control = PosLabel
+    AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = OKButton
+    AnchorSideBottom.Control = ButtonPanel1
     Left = 193
     Height = 146
     Top = 6
     Width = 181
     Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
-    BorderSpacing.Around = 6
+    BorderSpacing.Left = 3
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     Caption = 'HeightRadioGroup'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -109,7 +86,7 @@ object SizeComponentsDialog: TSizeComponentsDialog
     ChildSizing.ControlsPerLine = 1
     ClientHeight = 128
     ClientWidth = 177
-    TabOrder = 3
+    TabOrder = 1
     object HeightEdit: TEdit
       AnchorSideBottom.Control = HeightRadioGroup
       AnchorSideBottom.Side = asrBottom
@@ -123,4 +100,13 @@ object SizeComponentsDialog: TSizeComponentsDialog
       Text = 'HeightEdit'
     end
   end
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 158
+    Width = 368
+    TabOrder = 2
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
+  end
 end

designer/sizecompsdlg.lrs

@@ -1,51 +1,47 @@
 { Ýòî - ôàéë ðåñóðñîâ, àâòîìàòè÷åñêè ñîçäàííûé lazarus }
 
 LazarusResources.Add('TSizeComponentsDialog','FORMDATA',[
-  'TPF0'#21'TSizeComponentsDialog'#20'SizeComponentsDialog'#4'Left'#3'{'#1#6'He'
+  'TPF0'#21'TSizeComponentsDialog'#20'SizeComponentsDialog'#4'Left'#3#156#2#6'H'
-  +'ight'#3#190#0#3'Top'#3#233#2#5'Width'#3'|'#1#13'ActiveControl'#7#8'OKButton'
+  +'eight'#3#190#0#3'Top'#3#144#1#5'Width'#3'|'#1#11'BorderStyle'#7#13'bsSizeTo'
-  +#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#20'SizeComponentsDialog'#12
+  +'olWin'#7'Caption'#6#20'SizeComponentsDialog'#12'ClientHeight'#3#190#0#11'Cl'
-  +'ClientHeight'#3#190#0#11'ClientWidth'#3'|'#1#7'OnClose'#7#9'FormClose'#8'On'
+  +'ientWidth'#3'|'#1#7'OnClose'#7#9'FormClose'#8'Position'#7#14'poScreenCenter'
-  +'Resize'#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6
+  +#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#8'PosLabel'#22'AnchorSideLeft.Contro'
-  +'0.9.27'#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRight.Control'#7#12'CancelBut'
+  +'l'#7#5'Owner'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Contr'
-  +'ton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9
+  +'ol'#7#5'Owner'#4'Left'#3#190#0#6'Height'#2#14#3'Top'#2#0#5'Width'#2#1#11'Pa'
-  +'asrBottom'#4'Left'#3#232#0#6'Height'#2#26#3'Top'#3#158#0#5'Width'#2';'#7'An'
+  +'rentColor'#8#0#0#11'TRadioGroup'#15'WidthRadioGroup'#22'AnchorSideLeft.Cont'
-  +'chors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Con'
-  +#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'b'
+  +'trol'#7#8'PosLabel'#24'AnchorSideBottom.Control'#7#16'HeightRadioGroup'#21
-  +'kOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#12
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#146#0#3'Top'#2
-  +'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Sid'
+  +#6#5'Width'#3#181#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
-  +'e'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBott'
+  +#8'AutoFill'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'Borde'
-  +'om.Side'#7#9'asrBottom'#4'Left'#3')'#1#6'Height'#2#26#3'Top'#3#158#0#5'Widt'
+  +'rSpacing.Right'#2#3#7'Caption'#6#15'WidthRadioGroup'#28'ChildSizing.LeftRig'
-  +'h'#2'M'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpaci'
+  +'htSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeH'
-  +'ng.Right'#2#6#20'BorderSpacing.Bottom'#2#6#6'Cancel'#9#7'Caption'#6#6'Cance'
+  +'orizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7
-  +'l'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#1#0#0#11'TRadioGroup'#15'WidthRadioGroup'#22'AnchorSideLeft.Control'#7#5'Ow'
-  +'ner'#24'AnchorSideBottom.Control'#7#16'HeightRadioGroup'#21'AnchorSideBotto'
-  +'m.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#146#0#3'Top'#2#6#5'Width'#3
-  +#181#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#18'Borde'
-  +'rSpacing.Left'#2#6#7'Caption'#6#15'WidthRadioGroup'#28'ChildSizing.LeftRigh'
-  +'tSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHo'
-  +'rizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7
   +#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScale'
   +'Childs'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.'
   +'Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'
-  +#2#1#12'ClientHeight'#3#128#0#11'ClientWidth'#3#177#0#8'TabOrder'#2#2#0#5'TE'
+  +#2#1#12'ClientHeight'#3#128#0#11'ClientWidth'#3#177#0#8'TabOrder'#2#0#0#5'TE'
   +'dit'#9'WidthEdit'#24'AnchorSideBottom.Control'#7#15'WidthRadioGroup'#21'Anc'
   +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2'V'#6'Height'#2#23#3'Top'#2'c'#5
   +'Width'#2'P'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'
   +#2#6#8'TabOrder'#2#0#4'Text'#6#9'WidthEdit'#0#0#0#11'TRadioGroup'#16'HeightR'
-  +'adioGroup'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
+  +'adioGroup'#22'AnchorSideLeft.Control'#7#8'PosLabel'#21'AnchorSideTop.Contro'
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'OKButton'#4'Left'#3#193#0#6'H'
+  +'l'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Sid'
-  +'eight'#3#146#0#3'Top'#2#6#5'Width'#3#181#0#7'Anchors'#11#5'akTop'#6'akLeft'
+  +'e'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'ButtonPanel1'#4'Left'#3
-  +#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +#193#0#6'Height'#3#146#0#3'Top'#2#6#5'Width'#3#181#0#7'Anchors'#11#5'akTop'#6
-  +'on'#6#16'HeightRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSiz'
+  +'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#18'BorderSpacing.Left'#2#3#17
-  +'ing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogen'
+  +'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#16'HeightRa'
-  +'ousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResi'
+  +'dioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpac'
-  +'ze'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Sh'
+  +'ing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27
-  +'rinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRig'
+  +'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.'
-  +'htThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#3
+  +'ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14
-  +#128#0#11'ClientWidth'#3#177#0#8'TabOrder'#2#3#0#5'TEdit'#10'HeightEdit'#24
+  +'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'
-  +'AnchorSideBottom.Control'#7#16'HeightRadioGroup'#21'AnchorSideBottom.Side'#7
+  +#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#3#128#0#11'ClientWidth'
-  +#9'asrBottom'#4'Left'#2'W'#6'Height'#2#23#3'Top'#2'c'#5'Width'#2'P'#7'Anchor'
+  +#3#177#0#8'TabOrder'#2#1#0#5'TEdit'#10'HeightEdit'#24'AnchorSideBottom.Contr'
-  +'s'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0
+  +'ol'#7#16'HeightRadioGroup'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
-  +#4'Text'#6#10'HeightEdit'#0#0#0#0
+  +#2'W'#6'Height'#2#23#3'Top'#2'c'#5'Width'#2'P'#7'Anchors'#11#7'akRight'#8'ak'
+  +'Bottom'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#10'HeightE'
+  +'dit'#0#0#0#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Height'#2#26#3'T'
+  +'op'#3#158#0#5'Width'#3'p'#1#8'TabOrder'#2#2#11'ShowButtons'#11#4'pbOK'#8'pb'
+  +'Cancel'#0#9'ShowBevel'#8#0#0#0
 ]);

designer/sizecompsdlg.pp

@@ -31,19 +31,18 @@ interface
 
 uses
   Classes, SysUtils, LCLIntf, Forms, Controls, Buttons, ExtCtrls, StdCtrls,
-  LResources;
+  LResources, ButtonPanel;
 
 type
   { TSizeComponentsDialog }
   TSizeComponentsDialog = class(TForm)
-    OKButton: TBitBtn;
+    ButtonPanel1: TButtonPanel;
-    CancelButton: TBitBtn;
+    PosLabel: TLabel;
     WidthRadioGroup: TRadioGroup;
     HeightRadioGroup: TRadioGroup;
     WidthEdit: TEdit;
     HeightEdit: TEdit;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
-    procedure FormResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent);  override;
   end;
@@ -56,27 +55,22 @@ uses LazarusIDEStrConsts;
 
 function ShowSizeComponentsDialog(var HorizSizingID, FixedWidth,
   VertSizingID, FixedHeight: integer): TModalResult;
-var SizeComponentsDialog: TSizeComponentsDialog;
+var
+  SizeComponentsDialog: TSizeComponentsDialog;
 begin
-  SizeComponentsDialog:=TSizeComponentsDialog.Create(nil);
+  SizeComponentsDialog := TSizeComponentsDialog.Create(nil);
-  with SizeComponentsDialog do begin
+  with SizeComponentsDialog do
-    Result:=ShowModal;
+  begin
-    HorizSizingID:=SizeComponentsDialog.WidthRadioGroup.ItemIndex;
+    Result := ShowModal;
-    FixedWidth:=StrToIntDef(SizeComponentsDialog.WidthEdit.Text,0);
+    HorizSizingID := WidthRadioGroup.ItemIndex;
-    VertSizingID:=SizeComponentsDialog.HeightRadioGroup.ItemIndex;
+    FixedWidth := StrToIntDef(WidthEdit.Text,0);
-    FixedHeight:=StrToIntDef(SizeComponentsDialog.HeightEdit.Text,0);
+    VertSizingID := HeightRadioGroup.ItemIndex;
+    FixedHeight := StrToIntDef(HeightEdit.Text,0);
   end;
 end;
 
 { TSizeComponentsDialog }
 
-procedure TSizeComponentsDialog.FormResize(Sender: TObject);
-begin
-  WidthRadioGroup.Width := ClientWidth div 2 - 9;
-  HeightRadioGroup.Left := WidthRadioGroup.Width + 12;
-  HeightRadioGroup.Width := ClientWidth div 2 - 9;
-end;
-
 procedure TSizeComponentsDialog.FormClose(Sender: TObject;
   var CloseAction: TCloseAction);
 begin
@@ -89,9 +83,11 @@ begin
 
   Caption:=fdmSizeWord;
 
-  with WidthRadioGroup do begin
+  with WidthRadioGroup do
+  begin
     Caption:=dlgWidthPos;
-    with Items do begin
+    with Items do
+    begin
       BeginUpdate;
       Add(lisNoChange);
       Add(lisShrinkToSmal);
@@ -102,9 +98,11 @@ begin
     ItemIndex:=0;
   end;
 
-  with HeightRadioGroup do begin
+  with HeightRadioGroup do
+  begin
     Caption:=DlgHeightPos;
-    with Items do begin
+    with Items do
+    begin
       BeginUpdate;
       Add(lisNoChange);
       Add(lisShrinkToSmal);
@@ -118,10 +116,8 @@ begin
   WidthEdit.Text:='';
   HeightEdit.Text:='';
 
-  OkButton.Caption:=lisOkBtn;
+  ButtonPanel1.OkButton.Caption := lisOkBtn;
-  CancelButton.Caption:= dlgCancel;
+  ButtonPanel1.CancelButton.Caption := dlgCancel;
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
 end;
 
 initialization

designer/taborderdlg.lfm

@@ -43,14 +43,13 @@ object TabOrderDialog: TTabOrderDialog
     AnchorSideTop.Control = Owner
     AnchorSideBottom.Control = ShowOldValuesCheckbox
     Left = 6
-    Height = 309
+    Height = 320
     Top = 6
     Width = 267
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
-    DefaultItemHeight = 19
+    DefaultItemHeight = 15
     HideSelection = False
-    ParentCtl3D = False
     ReadOnly = True
     RightClickSelect = True
     TabOrder = 0
@@ -58,11 +57,11 @@ object TabOrderDialog: TTabOrderDialog
   end
   object ShowOldValuesCheckbox: TCheckBox
     AnchorSideLeft.Control = Owner
-    AnchorSideBottom.Control = CancelButton
+    AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 22
+    Height = 17
-    Top = 321
+    Top = 332
-    Width = 183
+    Width = 141
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'ShowOldValuesCheckbox'
@@ -70,13 +69,12 @@ object TabOrderDialog: TTabOrderDialog
     TabOrder = 1
   end
   object OkButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 163
+    Left = 161
-    Height = 36
+    Height = 26
-    Top = 345
+    Top = 355
-    Width = 57
+    Width = 59
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -87,23 +85,18 @@ object TabOrderDialog: TTabOrderDialog
     OnClick = OkButtonCLICK
     TabOrder = 2
   end
-  object CancelButton: TBitBtn
+  object BtnPanel: TButtonPanel
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
-    Left = 226
+    Left = 6
-    Height = 32
+    Height = 26
-    Top = 349
+    Top = 355
-    Width = 78
+    Width = 298
     Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
     TabOrder = 3
+    ShowButtons = [pbOK, pbCancel]
+    ShowBevel = False
   end
 end

designer/taborderdlg.lrs

@@ -17,26 +17,24 @@ LazarusResources.Add('TTabOrderDialog','FORMDATA',[
   +#7'OnClick'#7#20'DownSpeedbuttonCLICK'#0#0#9'TTreeView'#12'ItemTreeview'#22
   +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#24
   +'AnchorSideBottom.Control'#7#21'ShowOldValuesCheckbox'#4'Left'#2#6#6'Height'
-  +#3'5'#1#3'Top'#2#6#5'Width'#3#11#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +#3'@'#1#3'Top'#2#6#5'Width'#3#11#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#17'DefaultItemHeight'#2#19#13
+  +'t'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#17'DefaultItemHeight'#2#15#13
-  +'HideSelection'#8#11'ParentCtl3D'#8#8'ReadOnly'#9#16'RightClickSelect'#9#8'T'
+  +'HideSelection'#8#8'ReadOnly'#9#16'RightClickSelect'#9#8'TabOrder'#2#0#7'Opt'
-  +'abOrder'#2#0#7'Options'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'
+  +'ions'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#19
-  +#11'tvoReadOnly'#19'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'
+  +'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11
-  +#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'
+  +'tvoToolTips'#0#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'#22'AnchorSideLeft'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#12'Can'
+  +'.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6
-  +'celButton'#4'Left'#2#6#6'Height'#2#22#3'Top'#3'A'#1#5'Width'#3#183#0#7'Anch'
+  +#6'Height'#2#17#3'Top'#3'L'#1#5'Width'#3#141#0#7'Anchors'#11#6'akLeft'#8'akB'
-  +'ors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21
+  +'ottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ShowOldValuesCheckbox'
-  +'ShowOldValuesCheckbox'#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrd'
+  +#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#1#0#0#7'TBitBtn'#8
-  +'er'#2#1#0#0#7'TBitBtn'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelB'
+  +'OkButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
-  +'utton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9
+  +#7#9'asrBottom'#4'Left'#3#161#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2';'#7
-  +'asrBottom'#4'Left'#3#163#0#6'Height'#2'$'#3'Top'#3'Y'#1#5'Width'#2'9'#7'Anc'
+  +'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'
-  +'hors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +#2#6#7'Caption'#6#3'&OK'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2
-  +#7'Caption'#6#3'&OK'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7
+  +#0#7'OnClick'#7#13'OkButtonCLICK'#8'TabOrder'#2#2#0#0#12'TButtonPanel'#8'Btn'
-  +'OnClick'#7#13'OkButtonCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'
+  +'Panel'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+  +'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
-  +'om'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'a'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#3'*'#1#7'A'
-  +'srBottom'#4'Left'#3#226#0#6'Height'#2' '#3'Top'#3']'#1#5'Width'#2'N'#7'Anch'
+  +'nchors'#11#7'akRight'#8'akBottom'#0#8'TabOrder'#2#3#11'ShowButtons'#11#4'pb'
-  +'ors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +'OK'#8'pbCancel'#0#9'ShowBevel'#8#0#0#0
-  +#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2
-  +#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#0
 ]);

designer/taborderdlg.pas

@@ -33,7 +33,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, LCLProc, Forms, Controls, Graphics, Dialogs,
-  Buttons, ComCtrls, StdCtrls, Arrow, LazarusIDEStrConsts;
+  Buttons, ComCtrls, StdCtrls, Arrow, LazarusIDEStrConsts, ButtonPanel;
 
 type
 
@@ -42,7 +42,7 @@ type
   TTabOrderDialog = class(TForm)
     ArrowDown: TSpeedButton;
     ArrowUp: TSpeedButton;
-    CancelButton: TBitBtn;
+    BtnPanel: TButtonPanel;
     OkButton:     TBitBtn;
     ShowOldValuesCheckbox: TCheckBox;
     ItemTreeview: TTreeView;
@@ -83,12 +83,11 @@ end;
 
 procedure TTabOrderDialog.TabOrderDialogCREATE(Sender: TObject);
 begin
-  ShowOldValuesCheckbox.Caption:=lisShowOldTabOrder;
+  ShowOldValuesCheckbox.Caption := lisShowOldTabOrder;
-  OkButton.Caption:= lisOkBtn;
+  BtnPanel.OkButton.Caption := lisOkBtn;
-  CancelButton.Caption:= dlgCancel;
+  BtnPanel.OKButton.OnClick := @OkButtonCLICK;
+  BtnPanel.CancelButton.Caption := dlgCancel;
 
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
   ArrowDown.LoadGlyphFromLazarusResource('arrow_down');
   ArrowUp.LoadGlyphFromLazarusResource('arrow_up');
 end;