From 92111f758085e0296cafc0643eb01bce0478549e Mon Sep 17 00:00:00 2001 From: marc Date: Sun, 25 Feb 2007 16:06:20 +0000 Subject: [PATCH] * Some fixes from Graeme Geldenhuys git-svn-id: trunk@10680 - --- designer/aligncompsdlg.lfm | 84 +++++++++++++++++++++++--------------- designer/aligncompsdlg.lrs | 57 ++++++++++++++++---------- ide/clipboardhistory.pas | 7 +--- ide/environmentopts.pp | 2 + ide/helpmanager.lfm | 4 +- ide/helpmanager.lrs | 24 +++++------ ide/lazdocfrm.pas | 3 ++ 7 files changed, 108 insertions(+), 73 deletions(-) diff --git a/designer/aligncompsdlg.lfm b/designer/aligncompsdlg.lfm index 0be713c1eb..d466ce4a9e 100644 --- a/designer/aligncompsdlg.lfm +++ b/designer/aligncompsdlg.lfm @@ -1,69 +1,89 @@ object AlignComponentsDialog: TAlignComponentsDialog + Left = 312 + Height = 238 + Top = 606 + Width = 400 + HorzScrollBar.Page = 399 + VertScrollBar.Page = 237 ActiveControl = OKButton BorderStyle = bsSizeToolWin Caption = 'AlignComponentsDialog' - ClientHeight = 238 - ClientWidth = 400 OnResize = FormResize - PixelsPerInch = 96 Position = poScreenCenter - HorzScrollBar.Page = 399 - VertScrollBar.Page = 237 - Left = 312 - Height = 238 - Top = 674 - Width = 400 object HorizontalRadioGroup: TRadioGroup + Left = 6 + Height = 195 + Top = 6 + Width = 191 Anchors = [akTop, akLeft, akBottom] + AutoFill = True BorderSpacing.Around = 6 Caption = 'HorizontalRadioGroup' + 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 - Left = 6 - Height = 190 - Top = 6 - Width = 191 end object VerticalRadioGroup: TRadioGroup - Anchors = [akTop, akRight, akBottom] - BorderSpacing.Around = 6 - Caption = 'VerticalRadioGroup' - TabOrder = 1 AnchorSideBottom.Control = OKButton Left = 203 - Height = 190 + Height = 195 Top = 6 Width = 191 + Anchors = [akTop, akRight, akBottom] + AutoFill = True + BorderSpacing.Around = 6 + Caption = 'VerticalRadioGroup' + 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 = 1 end object OKButton: TBitBtn + AnchorSideRight.Control = CancelButton + Left = 226 + Height = 25 + Top = 207 + Width = 75 Anchors = [akRight, akBottom] - BorderSpacing.Bottom = 6 - + AutoSize = True + BorderSpacing.Right = 6 Caption = '&OK' + Constraints.MaxHeight = 25 + Constraints.MinWidth = 75 Default = True Kind = bkOK ModalResult = 1 NumGlyphs = 0 TabOrder = 2 - AnchorSideBottom.Control = Owner - AnchorSideBottom.Side = asrBottom - Left = 319 - Height = 30 - Top = 202 - Width = 75 end object CancelButton: TBitBtn + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 307 + Height = 25 + Top = 207 + Width = 87 Anchors = [akRight, akBottom] + AutoSize = True BorderSpacing.Right = 6 - + BorderSpacing.Bottom = 6 Caption = 'Cancel' + Constraints.MaxHeight = 25 + Constraints.MinWidth = 75 Kind = bkCancel ModalResult = 2 NumGlyphs = 0 TabOrder = 3 - AnchorSideRight.Control = OKButton - Left = 238 - Height = 30 - Top = 202 - Width = 75 end end diff --git a/designer/aligncompsdlg.lrs b/designer/aligncompsdlg.lrs index 8c811ca02c..790aae1fc1 100644 --- a/designer/aligncompsdlg.lrs +++ b/designer/aligncompsdlg.lrs @@ -1,23 +1,38 @@ +{ This is an automatically generated lazarus resource file } + LazarusResources.Add('TAlignComponentsDialog','FORMDATA',[ - 'TPF0'#22'TAlignComponentsDialog'#21'AlignComponentsDialog'#13'ActiveControl' - +#7#8'OKButton'#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComp' - +'onentsDialog'#12'ClientHeight'#3#238#0#11'ClientWidth'#3#144#1#8'OnResize'#7 - +#10'FormResize'#13'PixelsPerInch'#2'`'#8'Position'#7#14'poScreenCenter'#18'H' - +'orzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3#237#0#4'Left'#3'8'#1#6 - +'Height'#3#238#0#3'Top'#3#162#2#5'Width'#3#144#1#0#11'TRadioGroup'#20'Horizo' - +'ntalRadioGroup'#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpa' - +'cing.Around'#2#6#7'Caption'#6#20'HorizontalRadioGroup'#8'TabOrder'#2#0#4'Le' - +'ft'#2#6#6'Height'#3#190#0#3'Top'#2#6#5'Width'#3#191#0#0#0#11'TRadioGroup'#18 - +'VerticalRadioGroup'#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#20'Bord' - +'erSpacing.Around'#2#6#7'Caption'#6#18'VerticalRadioGroup'#8'TabOrder'#2#1#24 - +'AnchorSideBottom.Control'#7#8'OKButton'#4'Left'#3#203#0#6'Height'#3#190#0#3 - +'Top'#2#6#5'Width'#3#191#0#0#0#7'TBitBtn'#8'OKButton'#7'Anchors'#11#7'akRigh' - +'t'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#3'&OK'#7'Default' - +#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#24 - +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto' - +'m'#4'Left'#3'?'#1#6'Height'#2#30#3'Top'#3#202#0#5'Width'#2'K'#0#0#7'TBitBtn' - +#12'CancelButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#19'BorderSpacing.Ri' - +'ght'#2#6#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9 - +'NumGlyphs'#2#0#8'TabOrder'#2#3#23'AnchorSideRight.Control'#7#8'OKButton'#4 - +'Left'#3#238#0#6'Height'#2#30#3'Top'#3#202#0#5'Width'#2'K'#0#0#0 + 'TPF0'#22'TAlignComponentsDialog'#21'AlignComponentsDialog'#4'Left'#3'8'#1#6 + +'Height'#3#238#0#3'Top'#3'^'#2#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143 + +#1#18'VertScrollBar.Page'#3#237#0#13'ActiveControl'#7#8'OKButton'#11'BorderS' + +'tyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComponentsDialog'#8'OnResize' + +#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#0#11'TRadioGroup'#20'Hori' + +'zontalRadioGroup'#4'Left'#2#6#6'Height'#3#195#0#3'Top'#2#6#5'Width'#3#191#0 + +#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpaci' + +'ng.Around'#2#6#7'Caption'#6#20'HorizontalRadioGroup'#28'ChildSizing.LeftRig' + +'htSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeH' + +'orizontal'#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#8'TabOrder'#2#0#0#0#11'TRadioGroup'#18'VerticalRadioGroup'#24'AnchorSid' + +'eBottom.Control'#7#8'OKButton'#4'Left'#3#203#0#6'Height'#3#195#0#3'Top'#2#6 + +#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoFill' + +#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'VerticalRadioGroup'#28'Child' + +'Sizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildS' + +'izing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enla' + +'rgeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal' + +#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18 + +'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Cont' + +'rolsPerLine'#2#1#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRi' + +'ght.Control'#7#12'CancelButton'#4'Left'#3#226#0#6'Height'#2#25#3'Top'#3#207 + +#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'Bor' + +'derSpacing.Right'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MaxHeight'#2#25#20 + +'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2 + +#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#23'Ancho' + +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le' + +'ft'#3'3'#1#6'Height'#2#25#3'Top'#3#207#0#5'Width'#2'W'#7'Anchors'#11#7'akRi' + +'ght'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpaci' + +'ng.Bottom'#2#6#7'Caption'#6#6'Cancel'#21'Constraints.MaxHeight'#2#25#20'Con' + +'straints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyp' + +'hs'#2#0#8'TabOrder'#2#3#0#0#0 ]); diff --git a/ide/clipboardhistory.pas b/ide/clipboardhistory.pas index c825fc998a..78aacdd580 100644 --- a/ide/clipboardhistory.pas +++ b/ide/clipboardhistory.pas @@ -93,17 +93,12 @@ begin end; constructor TClipBoardHistory.Create(TheOwner: TComponent); -var - ALayout: TIDEWindowLayout; begin inherited Create(TheOwner); Name:=NonModalIDEWindowNames[nmiwClipbrdHistoryName]; Caption := 'Clipboard History'; - ALayout:=EnvironmentOptions.IDEWindowLayoutList.ItemByFormID(Name); - ALayout.Form:=TForm(Self); - ALayout.Apply; - + EnvironmentOptions.IDEWindowLayoutList.Apply(Self, Name); CopyToIDEBitBtn:=TBitBtn.Create(Self); with CopyToIDEBitBtn do begin diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp index 39453ead7c..598089a875 100644 --- a/ide/environmentopts.pp +++ b/ide/environmentopts.pp @@ -1755,6 +1755,7 @@ begin Add(lisCodeExplorer); Add(lisMenuPackageGraph); Add(dlgUnitDepCaption); + Add(lisMenuLazDoc); EndUpdate; end; WindowPositionsBox:=TIDEWindowSetupLayoutComponent.Create(Self); @@ -2610,6 +2611,7 @@ begin 5: WindowPositionsBox.Layout:=FLayouts.ItemByEnum(nmiwCodeExplorerName); 6: WindowPositionsBox.Layout:=FLayouts.ItemByEnum(nmiwPkgGraphExplorer); 7: WindowPositionsBox.Layout:=FLayouts.ItemByEnum(nmiwUnitDependenciesName); + 8: WindowPositionsBox.Layout:=FLayouts.ItemByEnum(nmiwLazDocName); end; if Index>=0 then WindowPositionsBox.Caption:=WindowPositionsListBox.Items[Index]; diff --git a/ide/helpmanager.lfm b/ide/helpmanager.lfm index 4a1d62a93f..4bb97b38cd 100644 --- a/ide/helpmanager.lfm +++ b/ide/helpmanager.lfm @@ -1,7 +1,7 @@ object HelpSelectorDialog: THelpSelectorDialog Left = 328 Height = 300 - Top = 574 + Top = 573 Width = 500 HorzScrollBar.Page = 499 VertScrollBar.Page = 299 @@ -34,7 +34,7 @@ object HelpSelectorDialog: THelpSelectorDialog Height = 25 Top = 268 Width = 87 - Anchors = [akTop, akRight, akBottom] + Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Right = 6 Caption = 'Cancel' diff --git a/ide/helpmanager.lrs b/ide/helpmanager.lrs index e82edc7f20..3e8f60b4e6 100644 --- a/ide/helpmanager.lrs +++ b/ide/helpmanager.lrs @@ -2,7 +2,7 @@ LazarusResources.Add('THelpSelectorDialog','FORMDATA',[ 'TPF0'#19'THelpSelectorDialog'#18'HelpSelectorDialog'#4'Left'#3'H'#1#6'Height' - +#3','#1#3'Top'#3'>'#2#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'Ver' + +#3','#1#3'Top'#3'='#2#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'Ver' +'tScrollBar.Page'#3'+'#1#13'ActiveControl'#7#8'OKButton'#7'Caption'#6#18'Hel' +'pSelectorDialog'#7'OnClose'#7#23'HelpSelectorDialogClose'#8'Position'#7#14 +'poScreenCenter'#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRight.Control'#7#12'C' @@ -12,15 +12,15 @@ LazarusResources.Add('THelpSelectorDialog','FORMDATA',[ +#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8 +'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7 +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#151#1#6'Height'#2 - +#25#3'Top'#3#12#1#5'Width'#2'W'#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom' - +#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#6'Cancel'#21'Const' - +'raints.MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel' - +#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#9'TGroupBox'#13'No' - +'desGroupBox'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'#2#6#6 - +'Height'#3#0#1#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11 - +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7 - +'Caption'#6#13'NodesGroupBox'#8'TabOrder'#2#2#0#8'TListBox'#12'NodesListBox' - +#4'Left'#2#6#6'Height'#3#223#0#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alCl' - +'ient'#20'BorderSpacing.Around'#2#6#10'OnDblClick'#7#20'NodesListBoxDblClick' - +#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#0#0 + +#25#3'Top'#3#12#1#5'Width'#2'W'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut' + +'oSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#6'Cancel'#21'Constraints.' + +'MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'Moda' + +'lResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#9'TGroupBox'#13'NodesGrou' + +'pBox'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'#2#6#6'Height' + +#3#0#1#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop' + +#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6 + +#13'NodesGroupBox'#8'TabOrder'#2#2#0#8'TListBox'#12'NodesListBox'#4'Left'#2#6 + +#6'Height'#3#223#0#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alClient'#20'Bor' + +'derSpacing.Around'#2#6#10'OnDblClick'#7#20'NodesListBoxDblClick'#8'TabOrder' + +#2#0#8'TopIndex'#2#255#0#0#0#0 ]); diff --git a/ide/lazdocfrm.pas b/ide/lazdocfrm.pas index 38f05a0ce5..838ce18ee3 100644 --- a/ide/lazdocfrm.pas +++ b/ide/lazdocfrm.pas @@ -303,6 +303,9 @@ begin Reset; Application.AddOnIdleHandler(@ApplicationIdle); + + Name := NonModalIDEWindowNames[nmiwLazDocName]; + EnvironmentOptions.IDEWindowLayoutList.Apply(Self, Name); end; procedure TLazDocForm.FormDestroy(Sender: TObject);