From f54fad676bf031cb05d04f7a8e30b83df4f50ec8 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Mon, 18 Aug 2008 09:58:34 +0000
Subject: [PATCH] IDE: improved layout of TAddFileToAPackageDialog

git-svn-id: trunk@16109 -
---
 packager/addfiletoapackagedlg.lfm | 217 +++++++++++++++++-------------
 packager/addfiletoapackagedlg.lrs |  98 ++++++++------
 packager/addfiletoapackagedlg.pas |   1 +
 3 files changed, 182 insertions(+), 134 deletions(-)

diff --git a/packager/addfiletoapackagedlg.lfm b/packager/addfiletoapackagedlg.lfm
index d413e9188c..6257086691 100644
--- a/packager/addfiletoapackagedlg.lfm
+++ b/packager/addfiletoapackagedlg.lfm
@@ -1,140 +1,173 @@
 object AddFileToAPackageDialog: TAddFileToAPackageDialog
-  Caption = 'AddFileToAPackageDialog'
-  ClientHeight = 363
-  ClientWidth = 469
-  OnClose = AddFileToAPackageDlgClose
-  PixelsPerInch = 96
-  Position = poScreenCenter
-  ShowHint = True
-  HorzScrollBar.Page = 468
-  VertScrollBar.Page = 362
   Left = 347
-  Height = 363
+  Height = 424
   Top = 221
   Width = 469
+  ActiveControl = FileNameEdit
+  Caption = 'AddFileToAPackageDialog'
+  ClientHeight = 424
+  ClientWidth = 469
+  OnClose = AddFileToAPackageDlgClose
+  Position = poScreenCenter
+  ShowHint = True
+  LCLVersion = '0.9.25'
   object FileGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akRight, akBottom]
+    Left = 6
+    Height = 164
+    Top = 6
+    Width = 457
+    Align = alTop
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'FileGroupBox'
-    ClientHeight = 199
-    ClientWidth = 450
-    ParentColor = True
+    ClientHeight = 145
+    ClientWidth = 453
     TabOrder = 0
-    Left = 8
-    Height = 217
-    Top = 8
-    Width = 454
     object UnitNameLabel: TLabel
+      AnchorSideTop.Control = FileNameEdit
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 20
+      Top = 35
+      Width = 439
       Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.OnChange = nil
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 6
+      BorderSpacing.Right = 6
       Caption = 'UnitNameLabel'
-      Color = clNone
-      Left = 12
-      Height = 17
-      Top = 40
-      Width = 430
+      ParentColor = False
     end
     object FileTypeRadioGroup: TRadioGroup
-      Anchors = [akLeft, akRight, akBottom]
-      BorderSpacing.OnChange = nil
+      AnchorSideTop.Control = HasRegisterProcCheckBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 25
+      Top = 114
+      Width = 439
+      Anchors = [akTop, akLeft, akRight]
+      AutoFill = True
+      AutoSize = True
+      BorderSpacing.Around = 6
       Caption = 'FileTypeRadioGroup'
-      ParentColor = True
-      Left = 12
-      Height = 72
-      Top = 113
-      Width = 430
+      ChildSizing.LeftRightSpacing = 6
+      ChildSizing.TopBottomSpacing = 6
+      ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+      ChildSizing.EnlargeVertical = crsHomogenousChildResize
+      ChildSizing.ShrinkHorizontal = crsScaleChilds
+      ChildSizing.ShrinkVertical = crsScaleChilds
+      ChildSizing.Layout = cclLeftToRightThenTopToBottom
+      ChildSizing.ControlsPerLine = 1
+      Constraints.MinHeight = 25
+      TabOrder = 3
     end
     object FileNameEdit: TEdit
+      Left = 6
+      Height = 23
+      Top = 6
+      Width = 439
       Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.OnChange = nil
+      BorderSpacing.Around = 6
       ReadOnly = True
       TabOrder = 0
       Text = 'FileNameEdit'
-      Left = 12
-      Height = 23
-      Top = 8
-      Width = 430
     end
     object UnitNameEdit: TEdit
+      AnchorSideTop.Control = UnitNameLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 23
+      Top = 57
+      Width = 439
       Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.OnChange = nil
+      BorderSpacing.Top = 2
       TabOrder = 1
       Text = 'UnitNameEdit'
-      Left = 12
-      Height = 23
-      Top = 56
-      Width = 430
     end
     object HasRegisterProcCheckBox: TCheckBox
+      AnchorSideTop.Control = UnitNameEdit
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 22
+      Top = 86
+      Width = 439
       Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.OnChange = nil
+      BorderSpacing.Top = 6
       Caption = 'HasRegisterProcCheckBox'
       TabOrder = 2
-      Left = 12
-      Height = 23
-      Top = 88
-      Width = 430
     end
   end
   object PackagesGroupBox: TGroupBox
-    Anchors = [akLeft, akRight, akBottom]
-    BorderSpacing.OnChange = nil
-    Caption = 'PackagesGroupBox'
-    ClientHeight = 70
-    ClientWidth = 450
-    ParentColor = True
-    TabOrder = 1
-    Left = 8
+    Left = 6
     Height = 88
-    Top = 233
-    Width = 454
+    Top = 176
+    Width = 457
+    Align = alTop
+    Anchors = [akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    Caption = 'PackagesGroupBox'
+    ClientHeight = 69
+    ClientWidth = 453
+    TabOrder = 1
     object PackagesComboBox: TComboBox
-      Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.OnChange = nil
+      Left = 6
+      Height = 29
+      Top = 6
+      Width = 441
+      Align = alTop
+      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+      BorderSpacing.Around = 6
       MaxLength = 0
       TabOrder = 0
       Text = 'PackagesComboBox'
-      Left = 12
-      Height = 21
-      Top = 8
-      Width = 430
     end
     object ShowAllCheckBox: TCheckBox
-      Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.OnChange = nil
+      Left = 6
+      Height = 22
+      Top = 41
+      Width = 441
+      Align = alTop
+      BorderSpacing.Around = 6
       Caption = 'ShowAllCheckBox'
       OnClick = ShowAllCheckBoxClick
       TabOrder = 1
-      Left = 12
-      Height = 23
-      Top = 40
-      Width = 430
     end
   end
-  object CancelButton: TButton
-    Anchors = [akRight, akBottom]
+  object BtnPanel: TPanel
+    Height = 41
+    Top = 383
+    Width = 469
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.OnChange = nil
-    Caption = 'CancelButton'
-    ModalResult = 2
+    BevelOuter = bvNone
+    ClientHeight = 41
+    ClientWidth = 469
     TabOrder = 2
-    Left = 387
-    Height = 25
-    Top = 329
-    Width = 75
-  end
-  object OkButton: TButton
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Right = 10
-    Caption = 'OkButton'
-    OnClick = OkButtonClick
-    TabOrder = 3
-    AnchorSideTop.Control = CancelButton
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = CancelButton
-    Left = 302
-    Height = 25
-    Top = 329
-    Width = 75
+    object CancelButton: TButton
+      Left = 365
+      Height = 29
+      Top = 6
+      Width = 98
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = 'CancelButton'
+      Constraints.MinWidth = 75
+      ModalResult = 2
+      TabOrder = 0
+    end
+    object OkButton: TButton
+      Left = 284
+      Height = 29
+      Top = 6
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = 'OkButton'
+      Constraints.MinWidth = 75
+      OnClick = OkButtonClick
+      TabOrder = 1
+    end
   end
 end
diff --git a/packager/addfiletoapackagedlg.lrs b/packager/addfiletoapackagedlg.lrs
index 9d20860c80..0dfb0ddd7e 100644
--- a/packager/addfiletoapackagedlg.lrs
+++ b/packager/addfiletoapackagedlg.lrs
@@ -1,44 +1,58 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TAddFileToAPackageDialog','FORMDATA',[
-  'TPF0'#24'TAddFileToAPackageDialog'#23'AddFileToAPackageDialog'#7'Caption'#6
-  +#23'AddFileToAPackageDialog'#12'ClientHeight'#3'k'#1#11'ClientWidth'#3#213#1
-  +#7'OnClose'#7#25'AddFileToAPackageDlgClose'#13'PixelsPerInch'#2'`'#8'Positio'
-  +'n'#7#14'poScreenCenter'#8'ShowHint'#9#18'HorzScrollBar.Page'#3#212#1#18'Ver'
-  +'tScrollBar.Page'#3'j'#1#4'Left'#3'['#1#6'Height'#3'k'#1#3'Top'#3#221#0#5'Wi'
-  +'dth'#3#213#1#0#9'TGroupBox'#12'FileGroupBox'#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#7'akRight'#8'akBottom'#0#7'Caption'#6#12'FileGroupBox'#12'ClientHeight'#3
-  +#199#0#11'ClientWidth'#3#194#1#11'ParentColor'#9#8'TabOrder'#2#0#4'Left'#2#8
-  +#6'Height'#3#217#0#3'Top'#2#8#5'Width'#3#198#1#0#6'TLabel'#13'UnitNameLabel'
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#22'BorderSpacing.OnChange'#13
-  +#7'Caption'#6#13'UnitNameLabel'#5'Color'#7#6'clNone'#4'Left'#2#12#6'Height'#2
-  +#17#3'Top'#2'('#5'Width'#3#174#1#0#0#11'TRadioGroup'#18'FileTypeRadioGroup'#7
-  +'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13
-  +#7'Caption'#6#18'FileTypeRadioGroup'#11'ParentColor'#9#4'Left'#2#12#6'Height'
-  +#2'H'#3'Top'#2'q'#5'Width'#3#174#1#0#0#5'TEdit'#12'FileNameEdit'#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#22'BorderSpacing.OnChange'#13#8'ReadOnly'
-  +#9#8'TabOrder'#2#0#4'Text'#6#12'FileNameEdit'#4'Left'#2#12#6'Height'#2#23#3
-  +'Top'#2#8#5'Width'#3#174#1#0#0#5'TEdit'#12'UnitNameEdit'#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#0#22'BorderSpacing.OnChange'#13#8'TabOrder'#2#1#4
-  +'Text'#6#12'UnitNameEdit'#4'Left'#2#12#6'Height'#2#23#3'Top'#2'8'#5'Width'#3
-  +#174#1#0#0#9'TCheckBox'#23'HasRegisterProcCheckBox'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#23'HasRegis'
-  +'terProcCheckBox'#8'TabOrder'#2#2#4'Left'#2#12#6'Height'#2#23#3'Top'#2'X'#5
-  +'Width'#3#174#1#0#0#0#9'TGroupBox'#16'PackagesGroupBox'#7'Anchors'#11#6'akLe'
-  +'ft'#7'akRight'#8'akBottom'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#16
-  +'PackagesGroupBox'#12'ClientHeight'#2'F'#11'ClientWidth'#3#194#1#11'ParentCo'
-  +'lor'#9#8'TabOrder'#2#1#4'Left'#2#8#6'Height'#2'X'#3'Top'#3#233#0#5'Width'#3
-  +#198#1#0#9'TComboBox'#16'PackagesComboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#22'BorderSpacing.OnChange'#13#9'MaxLength'#2#0#8'TabOrder'#2#0#4
-  +'Text'#6#16'PackagesComboBox'#4'Left'#2#12#6'Height'#2#21#3'Top'#2#8#5'Width'
-  +#3#174#1#0#0#9'TCheckBox'#15'ShowAllCheckBox'#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#7'akRight'#0#22'BorderSpacing.OnChange'#13#7'Caption'#6#15'ShowAllCheckB'
-  +'ox'#7'OnClick'#7#20'ShowAllCheckBoxClick'#8'TabOrder'#2#1#4'Left'#2#12#6'He'
-  +'ight'#2#23#3'Top'#2'('#5'Width'#3#174#1#0#0#0#7'TButton'#12'CancelButton'#7
-  +'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#22'BorderSpacing.OnChang'
-  +'e'#13#7'Caption'#6#12'CancelButton'#11'ModalResult'#2#2#8'TabOrder'#2#2#4'L'
-  +'eft'#3#131#1#6'Height'#2#25#3'Top'#3'I'#1#5'Width'#2'K'#0#0#7'TButton'#8'Ok'
-  +'Button'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#19'BorderSpacing.'
-  +'Right'#2#10#7'Caption'#6#8'OkButton'#7'OnClick'#7#13'OkButtonClick'#8'TabOr'
-  +'der'#2#3#21'AnchorSideTop.Control'#7#12'CancelButton'#18'AnchorSideTop.Side'
-  +#7#9'asrCenter'#23'AnchorSideRight.Control'#7#12'CancelButton'#4'Left'#3'.'#1
-  +#6'Height'#2#25#3'Top'#3'I'#1#5'Width'#2'K'#0#0#0
+  'TPF0'#24'TAddFileToAPackageDialog'#23'AddFileToAPackageDialog'#4'Left'#3'['#1
+  +#6'Height'#3#168#1#3'Top'#3#221#0#5'Width'#3#213#1#13'ActiveControl'#7#12'Fi'
+  +'leNameEdit'#7'Caption'#6#23'AddFileToAPackageDialog'#12'ClientHeight'#3#168
+  +#1#11'ClientWidth'#3#213#1#7'OnClose'#7#25'AddFileToAPackageDlgClose'#8'Posi'
+  +'tion'#7#14'poScreenCenter'#8'ShowHint'#9#10'LCLVersion'#6#6'0.9.25'#0#9'TGr'
+  +'oupBox'#12'FileGroupBox'#4'Left'#2#6#6'Height'#3#164#0#3'Top'#2#6#5'Width'#3
+  +#201#1#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capt'
+  +'ion'#6#12'FileGroupBox'#12'ClientHeight'#3#145#0#11'ClientWidth'#3#197#1#8
+  +'TabOrder'#2#0#0#6'TLabel'#13'UnitNameLabel'#21'AnchorSideTop.Control'#7#12
+  +'FileNameEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#20#3'Top'#2'#'#5'Width'#3#183#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Rig'
+  +'ht'#2#6#7'Caption'#6#13'UnitNameLabel'#11'ParentColor'#8#0#0#11'TRadioGroup'
+  +#18'FileTypeRadioGroup'#21'AnchorSideTop.Control'#7#23'HasRegisterProcCheckB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'
+  +#2'r'#5'Width'#3#183#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoF'
+  +'ill'#9#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'FileTypeR'
+  +'adioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpa'
+  +'cing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'
+  +#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizi'
+  +'ng.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7
+  +#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBotto'
+  +'m'#27'ChildSizing.ControlsPerLine'#2#1#21'Constraints.MinHeight'#2#25#8'Tab'
+  +'Order'#2#3#0#0#5'TEdit'#12'FileNameEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2
+  +#6#5'Width'#3#183#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderS'
+  +'pacing.Around'#2#6#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#12'FileNameEdit'
+  +#0#0#5'TEdit'#12'UnitNameEdit'#21'AnchorSideTop.Control'#7#13'UnitNameLabel'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'9'
+  +#5'Width'#3#183#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpa'
+  +'cing.Top'#2#2#8'TabOrder'#2#1#4'Text'#6#12'UnitNameEdit'#0#0#9'TCheckBox'#23
+  +'HasRegisterProcCheckBox'#21'AnchorSideTop.Control'#7#12'UnitNameEdit'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'V'#5'W'
+  +'idth'#3#183#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacin'
+  +'g.Top'#2#6#7'Caption'#6#23'HasRegisterProcCheckBox'#8'TabOrder'#2#2#0#0#0#9
+  +'TGroupBox'#16'PackagesGroupBox'#4'Left'#2#6#6'Height'#2'X'#3'Top'#3#176#0#5
+  +'Width'#3#201#1#5'Align'#7#5'alTop'#7'Anchors'#11#6'akLeft'#7'akRight'#0#8'A'
+  +'utoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'PackagesGroupBox'#12
+  +'ClientHeight'#2'E'#11'ClientWidth'#3#197#1#8'TabOrder'#2#1#0#9'TComboBox'#16
+  +'PackagesComboBox'#4'Left'#2#6#6'Height'#2#29#3'Top'#2#6#5'Width'#3#185#1#5
+  +'Align'#7#5'alTop'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cba'
+  +'ctSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#8'TabOrd'
+  +'er'#2#0#4'Text'#6#16'PackagesComboBox'#0#0#9'TCheckBox'#15'ShowAllCheckBox'
+  +#4'Left'#2#6#6'Height'#2#22#3'Top'#2')'#5'Width'#3#185#1#5'Align'#7#5'alTop'
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'ShowAllCheckBox'#7'OnClick'#7
+  +#20'ShowAllCheckBoxClick'#8'TabOrder'#2#1#0#0#0#6'TPanel'#8'BtnPanel'#6'Heig'
+  +'ht'#2')'#3'Top'#3''#1#5'Width'#3#213#1#5'Align'#7#8'alBottom'#8'AutoSize'#9
+  +#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWidth'#3#213#1#8
+  +'TabOrder'#2#2#0#7'TButton'#12'CancelButton'#4'Left'#3'm'#1#6'Height'#2#29#3
+  +'Top'#2#6#5'Width'#2'b'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing'
+  +'.Around'#2#6#7'Caption'#6#12'CancelButton'#20'Constraints.MinWidth'#2'K'#11
+  +'ModalResult'#2#2#8'TabOrder'#2#0#0#0#7'TButton'#8'OkButton'#4'Left'#3#28#1#6
+  +'Height'#2#29#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#8'OkButton'#20'Constraints.MinWidth'
+  +#2'K'#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#1#0#0#0#0
 ]);
diff --git a/packager/addfiletoapackagedlg.pas b/packager/addfiletoapackagedlg.pas
index 741b0ab306..880b0bd9bb 100644
--- a/packager/addfiletoapackagedlg.pas
+++ b/packager/addfiletoapackagedlg.pas
@@ -52,6 +52,7 @@ type
     OkButton: TButton;
     HasRegisterProcCheckBox: TCheckBox;
     FileTypeRadioGroup: TRadioGroup;
+    BtnPanel: TPanel;
     UnitNameEdit: TEdit;
     FileNameEdit: TEdit;
     FileGroupBox: TGroupBox;