Index: C:/svn/lazarus/ide/encloseselectiondlg.lfm =================================================================== --- C:/svn/lazarus/ide/encloseselectiondlg.lfm (revision 9377) +++ C:/svn/lazarus/ide/encloseselectiondlg.lfm (working copy) @@ -1,58 +1,54 @@ object EncloseSelectionDialog: TEncloseSelectionDialog - Left = 406 + Left = 319 Height = 244 - Top = 308 + Top = 231 Width = 427 HorzScrollBar.Page = 426 VertScrollBar.Page = 243 - ActiveControl = OkButton Caption = 'Enclose Selection' - ClientHeight = 244 - ClientWidth = 427 OnCreate = EncloseSelectionDialogCREATE OnResize = EncloseSelectionDialogResize - PixelsPerInch = 96 Position = poScreenCenter - object OkButton: TButton + object TypeRadiogroup: TRadioGroup + Left = 8 + Height = 189 + Top = 8 + Width = 409 + Anchors = [akTop, akLeft, akRight, akBottom] + AutoFill = True + Caption = 'Type' + ChildSizing.LeftRightSpacing = 6 + ChildSizing.TopBottomSpacing = 6 + ChildSizing.EnlargeHorizontal = crsHomogenousChildResize + ChildSizing.EnlargeVertical = crsHomogenousChildResize + ChildSizing.ShrinkHorizontal = crsScaleChilds + ChildSizing.ShrinkVertical = crsScaleChilds + ChildSizing.Layout = cclLeftToRightThenTopToBottom + ChildSizing.ControlsPerLine = 1 + TabOrder = 0 + end + object btnOk: TButton Left = 88 Height = 25 Top = 208 Width = 107 Anchors = [akLeft, akBottom] - + BorderSpacing.InnerBorder = 2 Caption = 'Ok' Default = True ModalResult = 1 TabOrder = 1 end - object CancelButton: TButton + object btnCancel: TButton Left = 224 Height = 25 Top = 208 Width = 104 Anchors = [akLeft, akBottom] - + BorderSpacing.InnerBorder = 2 Cancel = True Caption = 'Cancel' ModalResult = 2 TabOrder = 2 end - object TypeRadiogroup: TRadioGroup - Left = 8 - Height = 189 - Top = 8 - Width = 409 - Anchors = [akTop, akLeft, akRight, akBottom] - AutoFill = True - Caption = 'Type' - ChildSizing.LeftRightSpacing = 6 - ChildSizing.TopBottomSpacing = 6 - ChildSizing.EnlargeHorizontal = crsHomogenousChildResize - ChildSizing.EnlargeVertical = crsHomogenousChildResize - ChildSizing.ShrinkHorizontal = crsScaleChilds - ChildSizing.ShrinkVertical = crsScaleChilds - ChildSizing.Layout = cclLeftToRightThenTopToBottom - ChildSizing.ControlsPerLine = 1 - TabOrder = 0 - end end Index: C:/svn/lazarus/ide/encloseselectiondlg.lrs =================================================================== --- C:/svn/lazarus/ide/encloseselectiondlg.lrs (revision 9377) +++ C:/svn/lazarus/ide/encloseselectiondlg.lrs (working copy) @@ -1,22 +1,23 @@ +{ This is an automatically generated lazarus resource file } + LazarusResources.Add('TEncloseSelectionDialog','FORMDATA',[ - 'TPF0'#23'TEncloseSelectionDialog'#22'EncloseSelectionDialog'#4'Left'#3#150#1 - +#6'Height'#3#244#0#3'Top'#3'4'#1#5'Width'#3#171#1#18'HorzScrollBar.Page'#3 - +#170#1#18'VertScrollBar.Page'#3#243#0#13'ActiveControl'#7#8'OkButton'#7'Capt' - +'ion'#6#17'Enclose Selection'#12'ClientHeight'#3#244#0#11'ClientWidth'#3#171 - +#1#8'OnCreate'#7#28'EncloseSelectionDialogCREATE'#8'OnResize'#7#28'EncloseSe' - +'lectionDialogResize'#13'PixelsPerInch'#2'`'#8'Position'#7#14'poScreenCenter' - +#0#7'TButton'#8'OkButton'#4'Left'#2'X'#6'Height'#2#25#3'Top'#3#208#0#5'Width' - +#2'k'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#2'Ok'#7'Default'#9 - +#11'ModalResult'#2#1#8'TabOrder'#2#1#0#0#7'TButton'#12'CancelButton'#4'Left' - +#3#224#0#6'Height'#2#25#3'Top'#3#208#0#5'Width'#2'h'#7'Anchors'#11#6'akLeft' - +#8'akBottom'#0#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8'TabO' - +'rder'#2#2#0#0#11'TRadioGroup'#14'TypeRadiogroup'#4'Left'#2#8#6'Height'#3#189 - +#0#3'Top'#2#8#5'Width'#3#153#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8 - +'akBottom'#0#8'AutoFill'#9#7'Caption'#6#4'Type'#28'ChildSizing.LeftRightSpac' - +'ing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizon' - +'tal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'cr' - +'sHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChild' - +'s'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layou' - +'t'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8 - +'TabOrder'#2#0#0#0#0 + 'TPF0'#23'TEncloseSelectionDialog'#22'EncloseSelectionDialog'#4'Left'#3'?'#1#6 + +'Height'#3#244#0#3'Top'#3#231#0#5'Width'#3#171#1#18'HorzScrollBar.Page'#3#170 + +#1#18'VertScrollBar.Page'#3#243#0#7'Caption'#6#17'Enclose Selection'#8'OnCre' + +'ate'#7#28'EncloseSelectionDialogCREATE'#8'OnResize'#7#28'EncloseSelectionDi' + +'alogResize'#8'Position'#7#14'poScreenCenter'#0#11'TRadioGroup'#14'TypeRadio' + +'group'#4'Left'#2#8#6'Height'#3#189#0#3'Top'#2#8#5'Width'#3#153#1#7'Anchors' + +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#7'Caption'#6#4 + +'Type'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing' + +#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'Chi' + +'ldSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.Shr' + +'inkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crs' + +'ScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27 + +'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#7'TButton'#5'btnOk'#4 + +'Left'#2'X'#6'Height'#2#25#3'Top'#3#208#0#5'Width'#2'k'#7'Anchors'#11#6'akLe' + +'ft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'Ok'#7'De' + +'fault'#9#11'ModalResult'#2#1#8'TabOrder'#2#1#0#0#7'TButton'#9'btnCancel'#4 + +'Left'#3#224#0#6'Height'#2#25#3'Top'#3#208#0#5'Width'#2'h'#7'Anchors'#11#6'a' + +'kLeft'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Captio' + +'n'#6#6'Cancel'#11'ModalResult'#2#2#8'TabOrder'#2#2#0#0#0 ]); Index: C:/svn/lazarus/ide/encloseselectiondlg.pas =================================================================== --- C:/svn/lazarus/ide/encloseselectiondlg.pas (revision 9377) +++ C:/svn/lazarus/ide/encloseselectiondlg.pas (working copy) @@ -54,8 +54,8 @@ { TEncloseSelectionDialog } TEncloseSelectionDialog = class(TForm) - OkButton: TBUTTON; - CancelButton: TBUTTON; + btnCancel: TButton; + btnOk: TButton; TypeRadiogroup: TRADIOGROUP; procedure EncloseSelectionDialogCREATE(Sender: TObject); procedure EncloseSelectionDialogResize(Sender: TObject); @@ -84,14 +84,14 @@ ): string; begin case TheType of - estTryFinally: Result:='Try..Finally'; - estTryExcept: Result:='Try..Except'; - estBeginEnd: Result:='Begin..End'; - estForBeginEnd: Result:='For | do begin..end'; - estWhileDoBeginEnd: Result:='While | do begin..end'; - estRepeatUntil: Result:='Repeat..Until |'; - estWith: Result:='With | do begin..end'; - estPascalComment: Result:='{..}'; + estTryFinally: Result:='Try..Finally'; + estTryExcept: Result:='Try..Except'; + estBeginEnd: Result:='Begin..End'; + estForBeginEnd: Result:='For | do begin..end'; + estWhileDoBeginEnd: Result:='While | do begin..end'; + estRepeatUntil: Result:='Repeat..Until |'; + estWith: Result:='With | do begin..end'; + estPascalComment: Result:='{..}'; else RaiseException('EncloseSelectionTypeDescription'); end; @@ -113,49 +113,49 @@ var Template: string); begin case TheType of - estTryFinally: - Template:='try'+LineEnding - +' '+LineEnding - +'finally'+LineEnding - +' |'+LineEnding - +'end;'+LineEnding; + estTryFinally: + Template:='try'+LineEnding + +' '+LineEnding + +'finally'+LineEnding + +' |'+LineEnding + +'end;'+LineEnding; - estTryExcept: - Template:='try'+LineEnding - +' '+LineEnding - +'except'+LineEnding - +' |'+LineEnding - +'end;'+LineEnding; + estTryExcept: + Template:='try'+LineEnding + +' '+LineEnding + +'except'+LineEnding + +' |'+LineEnding + +'end;'+LineEnding; - estBeginEnd: - Template:='begin'+LineEnding - +' |'+LineEnding - +'end;'+LineEnding; + estBeginEnd: + Template:='begin'+LineEnding + +' |'+LineEnding + +'end;'+LineEnding; - estForBeginEnd: - Template:='for | do begin'+LineEnding - +' '+LineEnding - +'end;'+LineEnding; + estForBeginEnd: + Template:='for | do begin'+LineEnding + +' '+LineEnding + +'end;'+LineEnding; - estWhileDoBeginEnd: - Template:='while | do begin'+LineEnding - +' '+LineEnding - +'end;'+LineEnding; + estWhileDoBeginEnd: + Template:='while | do begin'+LineEnding + +' '+LineEnding + +'end;'+LineEnding; - estRepeatUntil: - Template:='repeat'+LineEnding - +' '+LineEnding - +'until |;'+LineEnding; + estRepeatUntil: + Template:='repeat'+LineEnding + +' '+LineEnding + +'until |;'+LineEnding; - estWith: - Template:='with | do begin'+LineEnding - +' '+LineEnding - +'end;'+LineEnding; + estWith: + Template:='with | do begin'+LineEnding + +' '+LineEnding + +'end;'+LineEnding; - estPascalComment: - Template:='{'+LineEnding - +' |'+LineEnding - +'}'+LineEnding; + estPascalComment: + Template:='{'+LineEnding + +' |'+LineEnding + +'}'+LineEnding; else RaiseException('GetEnclosedSelectionParams'); @@ -406,8 +406,8 @@ t: TEncloseSelectionType; begin Caption:=lisEncloseSelection; - OkButton.Caption:=lisEnclose; - CancelButton.Caption:=dlgCancel; + btnOk.Caption:=lisEnclose; + btnCancel.Caption:=dlgCancel; TypeRadiogroup.Caption:=lisChooseStructureToEncloseSelection; with TypeRadiogroup.Items do begin BeginUpdate; @@ -423,9 +423,9 @@ c: Integer; begin c:=Width div 2; - OkButton.Width:=c-OkButton.Left-15; - CancelButton.Left:=c+15; - CancelButton.Width:=OkButton.Width; + btnOk.Width:=c-btnOk.Left-15; + btnCancel.Left:=c+15; + btnCancel.Width:=btnOk.Width; end; function TEncloseSelectionDialog.GetEncloseType: TEncloseSelectionType;