JCF2: fixed 'Clarify/Returns' page layout

git-svn-id: trunk@24918 -

components/jcf2/Ui/Settings/frClarifyReturns.lfm

@@ -3,14 +3,24 @@ inherited fClarifyReturns: TfClarifyReturns
   Width = 453
   ClientHeight = 284
   ClientWidth = 453
+  OnResize = FrameResize
+  TabOrder = 0
   DesignLeft = 819
   DesignTop = 395
   object rgReturnChars: TRadioGroup[0]
-    Left = 8
+    AnchorSideLeft.Control = Owner
-    Height = 99
+    AnchorSideTop.Control = gbRemoveReturns
-    Top = 174
+    AnchorSideTop.Side = asrBottom
-    Width = 438
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 6
+    Height = 81
+    Top = 151
+    Width = 441
+    Anchors = [akTop, akLeft, akRight]
     AutoFill = True
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Return chars'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -20,8 +30,8 @@ inherited fClarifyReturns: TfClarifyReturns
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 1
-    ClientHeight = 81
+    ClientHeight = 63
-    ClientWidth = 434
+    ClientWidth = 437
     Items.Strings = (
       'Leave as is'
       'Convert to Carriage Return (UNIX)'
@@ -30,86 +40,132 @@ inherited fClarifyReturns: TfClarifyReturns
     TabOrder = 2
   end
   object gbRemoveReturns: TGroupBox[1]
-    Left = 8
+    AnchorSideLeft.Control = Owner
-    Height = 160
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = gbInsert
+    Left = 6
+    Height = 139
     Hint = 'bgRemove'
-    Top = 8
+    Top = 6
-    Width = 202
+    Width = 204
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Remove returns'
-    ClientHeight = 142
+    ClientHeight = 121
-    ClientWidth = 198
+    ClientWidth = 200
     TabOrder = 0
     object cbRemoveProcDefReturns: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbRemoveReturns
+      AnchorSideTop.Control = cbRemovePropertyReturns
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 61
+      Top = 52
       Width = 132
+      BorderSpacing.Around = 6
       Caption = 'In procedure definitions'
       TabOrder = 2
     end
     object cbRemoveVarReturns: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbRemoveReturns
+      AnchorSideTop.Control = cbRemoveProcDefReturns
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 86
+      Top = 75
       Width = 130
+      BorderSpacing.Around = 6
       Caption = 'In variable declarations'
       TabOrder = 3
     end
     object cbRemoveExprReturns: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbRemoveReturns
+      AnchorSideTop.Control = cbRemoveVarReturns
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 111
+      Top = 98
       Width = 88
+      BorderSpacing.Around = 6
       Caption = 'In expressions'
       TabOrder = 4
     end
     object cbRemovePropertyReturns: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbRemoveReturns
+      AnchorSideTop.Control = cbRemoveReturns
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 36
+      Top = 29
       Width = 80
+      BorderSpacing.Around = 6
       Caption = 'In properties'
       TabOrder = 1
     end
     object cbRemoveReturns: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbRemoveReturns
+      AnchorSideTop.Control = gbRemoveReturns
+      Left = 6
       Height = 17
-      Top = 12
+      Top = 6
       Width = 109
+      BorderSpacing.Around = 6
       Caption = 'In misc. bad places'
       TabOrder = 0
     end
   end
   object gbInsert: TGroupBox[2]
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = gbRemoveReturns
+    AnchorSideBottom.Side = asrBottom
     Left = 216
-    Height = 161
+    Height = 139
-    Top = 7
+    Top = 6
-    Width = 230
+    Width = 231
+    Anchors = [akTop, akRight, akBottom]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     Caption = 'Insert returns'
-    ClientHeight = 143
+    ClientHeight = 121
-    ClientWidth = 226
+    ClientWidth = 227
     TabOrder = 1
     object cbUsesClauseOnePerLine: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbInsert
+      AnchorSideTop.Control = cbInsertReturns
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 39
+      Top = 29
       Width = 157
+      BorderSpacing.Around = 6
       Caption = 'One uses clause item per line'
       TabOrder = 1
     end
     object cbInsertReturns: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbInsert
+      AnchorSideTop.Control = gbInsert
+      Left = 6
       Height = 17
-      Top = 15
+      Top = 6
       Width = 115
+      BorderSpacing.Around = 6
       Caption = 'In misc. good places'
       TabOrder = 0
     end
     object cbBreakAfterUses: TCheckBox
-      Left = 8
+      AnchorSideLeft.Control = gbInsert
+      AnchorSideTop.Control = cbUsesClauseOnePerLine
+      AnchorSideTop.Side = asrBottom
+      Left = 6
       Height = 17
-      Top = 62
+      Top = 52
       Width = 68
+      BorderSpacing.Around = 6
       Caption = 'After uses'
       TabOrder = 2
     end

components/jcf2/Ui/Settings/frClarifyReturns.pas

@@ -51,6 +51,7 @@ type
     cbUsesClauseOnePerLine: TCheckBox;
     cbInsertReturns: TCheckBox;
     cbBreakAfterUses: TCheckBox;
+    procedure FrameResize(Sender:TObject);
   public
     constructor Create(AOwner: TComponent); override;
 
@@ -68,6 +69,10 @@ implementation
 uses
   SettingsTypes, JcfSettings, SetReturns, JcfHelp, jcfuiconsts;
 
+procedure TfClarifyReturns.FrameResize(Sender:TObject);
+begin
+  gbInsert.Width := (Width-18) div 2;
+end;
 
 constructor TfClarifyReturns.Create(AOwner: TComponent);
 begin