designer: reanchor align components dialog, use button panel

git-svn-id: trunk@19730 -

designer/aligncompsdlg.lfm

@@ -3,23 +3,37 @@ object AlignComponentsDialog: TAlignComponentsDialog
   Height = 238
   Top = 325
   Width = 400
-  ActiveControl = OKButton
   BorderStyle = bsSizeToolWin
   Caption = 'AlignComponentsDialog'
   ClientHeight = 238
   ClientWidth = 400
-  OnResize = FormResize
   Position = poScreenCenter
   LCLVersion = '0.9.27'
+  object PosLabel: TLabel
+    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Side = asrCenter
+    AnchorSideTop.Control = Owner
+    Left = 200
+    Height = 14
+    Top = 0
+    Width = 1
+    ParentColor = False
+  end
   object HorizontalRadioGroup: TRadioGroup
-    AnchorSideBottom.Control = ACDBtnPanel
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = PosLabel
+    AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 188
+    Height = 194
     Top = 6
     Width = 191
-    Anchors = [akTop, akLeft, akBottom]
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
-    BorderSpacing.Around = 6
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 3
+    BorderSpacing.Bottom = 6
     Caption = 'HorizontalRadioGroup'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -32,14 +46,21 @@ object AlignComponentsDialog: TAlignComponentsDialog
     TabOrder = 0
   end
   object VerticalRadioGroup: TRadioGroup
-    AnchorSideBottom.Control = ACDBtnPanel
+    AnchorSideLeft.Control = PosLabel
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = BtnPanel
     Left = 203
-    Height = 188
+    Height = 194
     Top = 6
     Width = 191
-    Anchors = [akTop, akRight, akBottom]
+    Anchors = [akTop, akLeft, akRight, akBottom]
     AutoFill = True
-    BorderSpacing.Around = 6
+    BorderSpacing.Left = 3
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
+    BorderSpacing.Bottom = 6
     Caption = 'VerticalRadioGroup'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -51,49 +72,13 @@ object AlignComponentsDialog: TAlignComponentsDialog
     ChildSizing.ControlsPerLine = 1
     TabOrder = 1
   end
-  object ACDBtnPanel: TPanel
+  object BtnPanel: TButtonPanel
-    Left = 0
+    Left = 6
-    Height = 38
+    Height = 26
-    Top = 200
+    Top = 206
-    Width = 400
+    Width = 388
-    Align = alBottom
-    AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 38
-    ClientWidth = 400
     TabOrder = 2
-    object OKButton: TBitBtn
+    ShowButtons = [pbOK, pbCancel]
-      Left = 236
+    ShowBevel = False
-      Height = 26
-      Top = 6
-      Width = 75
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = '&OK'
-      Constraints.MinWidth = 75
-      Default = True
-      Kind = bkOK
-      ModalResult = 1
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object CancelButton: TBitBtn
-      AnchorSideRight.Side = asrBottom
-      Left = 317
-      Height = 26
-      Top = 6
-      Width = 77
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Cancel = True
-      Caption = 'Cancel'
-      Constraints.MinWidth = 75
-      Kind = bkCancel
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 1
-    end
   end
 end

designer/aligncompsdlg.lrs

@@ -2,38 +2,37 @@
 
 LazarusResources.Add('TAlignComponentsDialog','FORMDATA',[
   'TPF0'#22'TAlignComponentsDialog'#21'AlignComponentsDialog'#4'Left'#3'j'#1#6
-  +'Height'#3#238#0#3'Top'#3'E'#1#5'Width'#3#144#1#13'ActiveControl'#7#8'OKButt'
+  +'Height'#3#238#0#3'Top'#3'E'#1#5'Width'#3#144#1#11'BorderStyle'#7#13'bsSizeT'
-  +'on'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComponentsDial'
+  +'oolWin'#7'Caption'#6#21'AlignComponentsDialog'#12'ClientHeight'#3#238#0#11
-  +'og'#12'ClientHeight'#3#238#0#11'ClientWidth'#3#144#1#8'OnResize'#7#10'FormR'
+  +'ClientWidth'#3#144#1#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.'
-  +'esize'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#11'TRa'
+  +'9.27'#0#6'TLabel'#8'PosLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#19'Anch'
-  +'dioGroup'#20'HorizontalRadioGroup'#24'AnchorSideBottom.Control'#7#11'ACDBtn'
+  +'orSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'
-  +'Panel'#4'Left'#2#6#6'Height'#3#188#0#3'Top'#2#6#5'Width'#3#191#0#7'Anchors'
+  +#3#200#0#6'Height'#2#14#3'Top'#2#0#5'Width'#2#1#11'ParentColor'#8#0#0#11'TRa'
-  +#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2
+  +'dioGroup'#20'HorizontalRadioGroup'#22'AnchorSideLeft.Control'#7#5'Owner'#21
-  +#6#7'Caption'#6#20'HorizontalRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6
+  +'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#8'PosLabel'
-  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
+  +#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Height'#3#194#0#3
-  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
+  +'Top'#2#6#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
-  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
+  +'ottom'#0#8'AutoFill'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6
-  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
+  +#19'BorderSpacing.Right'#2#3#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#20'Ho'
-  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'
+  +'rizontalRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.Top'
-  +#2#0#0#0#11'TRadioGroup'#18'VerticalRadioGroup'#24'AnchorSideBottom.Control'
+  +'BottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChil'
-  +#7#11'ACDBtnPanel'#4'Left'#3#203#0#6'Height'#3#188#0#3'Top'#2#6#5'Width'#3
+  +'dResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28
-  +#191#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'Bord'
+  +'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVer'
-  +'erSpacing.Around'#2#6#7'Caption'#6#18'VerticalRadioGroup'#28'ChildSizing.Le'
+  +'tical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenT'
-  +'ftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enl'
+  +'opToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#11'TRad'
-  +'argeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertic'
+  +'ioGroup'#18'VerticalRadioGroup'#22'AnchorSideLeft.Control'#7#8'PosLabel'#21
-  +'al'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'cr'
+  +'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20
-  +'sScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildS'
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'BtnPa'
-  +'izing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPe'
+  +'nel'#4'Left'#3#203#0#6'Height'#3#194#0#3'Top'#2#6#5'Width'#3#191#0#7'Anchor'
-  +'rLine'#2#1#8'TabOrder'#2#1#0#0#6'TPanel'#11'ACDBtnPanel'#4'Left'#2#0#6'Heig'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#18'BorderSp'
-  +'ht'#2'&'#3'Top'#3#200#0#5'Width'#3#144#1#5'Align'#7#8'alBottom'#8'AutoSize'
+  +'acing.Left'#2#3#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20'Bo'
-  +#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'#11'ClientWidth'#3#144#1#8
+  +'rderSpacing.Bottom'#2#6#7'Caption'#6#18'VerticalRadioGroup'#28'ChildSizing.'
-  +'TabOrder'#2#2#0#7'TBitBtn'#8'OKButton'#4'Left'#3#236#0#6'Height'#2#26#3'Top'
+  +'LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.E'
-  +#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Arou'
+  +'nlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVert'
-  +'nd'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Ki'
+  +'ical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14
-  +'nd'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TB'
+  +'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'Chil'
-  +'itBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'='
+  +'dSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Controls'
-  +#1#6'Height'#2#26#3'Top'#2#6#5'Width'#2'M'#5'Align'#7#7'alRight'#8'AutoSize'
+  +'PerLine'#2#1#8'TabOrder'#2#1#0#0#12'TButtonPanel'#8'BtnPanel'#4'Left'#2#6#6
-  +#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'Constr'
+  +'Height'#2#26#3'Top'#3#206#0#5'Width'#3#132#1#8'TabOrder'#2#2#11'ShowButtons'
-  +'aints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'
+  +#11#4'pbOK'#8'pbCancel'#0#9'ShowBevel'#8#0#0#0
-  +#2#0#8'TabOrder'#2#1#0#0#0#0
 ]);

designer/aligncompsdlg.pp

@@ -31,61 +31,53 @@ interface
 
 uses
   Classes, LCLIntf, Forms, Controls, Buttons, ExtCtrls, LResources,
-  LazarusIDEStrConsts;
+  LazarusIDEStrConsts, ButtonPanel, StdCtrls;
 
 type
   { TAlignComponentsDialog }
   TAlignComponentsDialog = class(TForm)
-    OKButton: TBitBtn;
+    BtnPanel: TButtonPanel;
-    CancelButton: TBitBtn;
     HorizontalRadioGroup: TRadioGroup;
-    ACDBtnPanel: TPanel;
+    PosLabel: TLabel;
     VerticalRadioGroup: TRadioGroup;
-    procedure FormResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent);  override;
   end;
 
-function ShowAlignComponentsDialog(var HorizAlignID, VertAlignID: integer
+function ShowAlignComponentsDialog(var HorizAlignID, VertAlignID: integer): TModalResult;
-  ): TModalResult;
 
 implementation
 
-function ShowAlignComponentsDialog(var HorizAlignID, VertAlignID: integer
+function ShowAlignComponentsDialog(var HorizAlignID, VertAlignID: integer): TModalResult;
-  ): TModalResult;
+var
-var AlignComponentsDialog: TAlignComponentsDialog;
+  AlignComponentsDialog: TAlignComponentsDialog;
 begin
-  AlignComponentsDialog:=TAlignComponentsDialog.Create(nil);
+  AlignComponentsDialog := TAlignComponentsDialog.Create(nil);
   try
-    with AlignComponentsDialog do begin
+    with AlignComponentsDialog do
-      HorizontalRadioGroup.ItemIndex:=0;
+    begin
-      VerticalRadioGroup.ItemIndex:=0;
+      HorizontalRadioGroup.ItemIndex := 0;
-      Result:=ShowModal;
+      VerticalRadioGroup.ItemIndex := 0;
-      HorizAlignID:=AlignComponentsDialog.HorizontalRadioGroup.ItemIndex;
+      Result := ShowModal;
-      VertAlignID:=AlignComponentsDialog.VerticalRadioGroup.ItemIndex;
+      HorizAlignID := AlignComponentsDialog.HorizontalRadioGroup.ItemIndex;
+      VertAlignID := AlignComponentsDialog.VerticalRadioGroup.ItemIndex;
     end;
   finally
     AlignComponentsDialog.Free;
   end;
 end;
 
-{ TAlignComponentsDialog }
-procedure TAlignComponentsDialog.FormResize(Sender: TObject);
-begin
-  HorizontalRadioGroup.Width := ClientWidth div 2 - 9;
-  VerticalRadioGroup.Left := HorizontalRadioGroup.Width + 12;
-  VerticalRadioGroup.Width := ClientWidth div 2 - 9;
-end;
-
 constructor TAlignComponentsDialog.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
 
   Caption:=lisAlignment;
 
-  with HorizontalRadioGroup do begin
+  with HorizontalRadioGroup do
+  begin
     Caption:=lisHorizontal;
-    with Items do begin
+    with Items do
+    begin
       BeginUpdate;
       Add(lisNoChange);
       Add(lisLeftSides);
@@ -99,9 +91,11 @@ begin
     end;
   end;
 
-  with VerticalRadioGroup do begin
+  with VerticalRadioGroup do
+  begin
     Caption:=lisVertical;
-    with Items do begin
+    with Items do
+    begin
       BeginUpdate;
       Add(lisNoChange);
       Add(lisTops);
@@ -115,10 +109,8 @@ begin
     end;
   end;
 
-  OkButton.Caption:=dlgButApply;
+  BtnPanel.OKButton.Caption := lisOkBtn;
-  CancelButton.Caption:=dlgCancel;
+  BtnPanel.CancelButton.Caption := dlgCancel;
-  OkButton.LoadGlyphFromLazarusResource('btn_ok');
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
 end;
 
 initialization