From 1b68eafebefbc6df21c4b62f3e7306f466488449 Mon Sep 17 00:00:00 2001 From: mattias Date: Fri, 11 Dec 2009 20:37:22 +0000 Subject: [PATCH] codetools: added option to not insert class comment for implementation git-svn-id: trunk@23086 - --- components/codetools/codecompletiontool.pas | 3 + components/codetools/sourcechanger.pas | 1 + ide/codetoolsoptions.pas | 12 ++ .../codetools_classcompletion_options.lfm | 23 +++- .../codetools_classcompletion_options.lrs | 115 +++++++++--------- .../codetools_classcompletion_options.pas | 35 ++---- ide/lazarusidestrconsts.pas | 1 + 7 files changed, 107 insertions(+), 83 deletions(-) diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas index db49c68c4e..989dd81466 100644 --- a/components/codetools/codecompletiontool.pas +++ b/components/codetools/codecompletiontool.pas @@ -6571,6 +6571,9 @@ var begin // insert class comment if ClassProcs.Count=0 then exit; + if not ASourceChangeCache.BeautifyCodeOptions.ClassImplementationComments + then + exit; // find the start of the class (the position in front of the class name) // check if there is already a comment in front if FindClassMethodsComment(InsertPos,CommentStart,CommentEnd) then begin diff --git a/components/codetools/sourcechanger.pas b/components/codetools/sourcechanger.pas index 2074ac9115..5f49ec304d 100644 --- a/components/codetools/sourcechanger.pas +++ b/components/codetools/sourcechanger.pas @@ -127,6 +127,7 @@ type KeepForwardProcOrder: boolean; // classes, methods, properties ClassHeaderComments: boolean; + ClassImplementationComments: boolean; ClassPartInsertPolicy: TClassPartInsertPolicy; MixMethodsAndProperties: boolean; MethodInsertPolicy: TMethodInsertPolicy; diff --git a/ide/codetoolsoptions.pas b/ide/codetoolsoptions.pas index 316716a4ce..c2478f997d 100644 --- a/ide/codetoolsoptions.pas +++ b/ide/codetoolsoptions.pas @@ -50,6 +50,7 @@ type TCodeToolsOptions = class(TAbstractIDEOptions) private FClassHeaderComments: boolean; + FClassImplementationComments: boolean; FFilename: string; FIdentComplAddParameterBrackets: boolean; @@ -153,6 +154,8 @@ type read FKeepForwardProcOrder write FKeepForwardProcOrder; property ClassHeaderComments: boolean read FClassHeaderComments write FClassHeaderComments; + property ClassImplementationComments: boolean + read FClassImplementationComments write FClassImplementationComments; property MethodInsertPolicy: TMethodInsertPolicy read FMethodInsertPolicy write FMethodInsertPolicy; property KeyWordPolicy : TWordPolicy @@ -377,6 +380,8 @@ begin 'CodeToolsOptions/KeepForwardProcOrder/Value',true); FClassHeaderComments:=XMLConfig.GetValue( 'CodeToolsOptions/ClassHeaderComments/Value',true); + FClassImplementationComments:=XMLConfig.GetValue( + 'CodeToolsOptions/ClassImplementationComments/Value',true); FMethodInsertPolicy:=MethodInsertPolicyNameToPolicy(XMLConfig.GetValue( 'CodeToolsOptions/MethodInsertPolicy/Value', @@ -497,6 +502,9 @@ begin 'CodeToolsOptions/KeepForwardProcOrder/Value',FKeepForwardProcOrder,true); XMLConfig.SetDeleteValue( 'CodeToolsOptions/ClassHeaderComments/Value',FClassHeaderComments,true); + XMLConfig.SetDeleteValue( + 'CodeToolsOptions/ClassImplementationComments/Value', + FClassImplementationComments,true); XMLConfig.SetDeleteValue('CodeToolsOptions/MethodInsertPolicy/Value', MethodInsertPolicyNames[FMethodInsertPolicy], MethodInsertPolicyNames[mipClassOrder]); @@ -613,6 +621,7 @@ begin FForwardProcBodyInsertPolicy:=CodeToolsOpts.ForwardProcBodyInsertPolicy; FKeepForwardProcOrder:=CodeToolsOpts.KeepForwardProcOrder; FClassHeaderComments:=CodeToolsOpts.ClassHeaderComments; + FClassImplementationComments:=CodeToolsOpts.ClassImplementationComments; FMethodInsertPolicy:=CodeToolsOpts.FMethodInsertPolicy; FKeyWordPolicy:=CodeToolsOpts.FKeyWordPolicy; FIdentifierPolicy:=CodeToolsOpts.FIdentifierPolicy; @@ -661,6 +670,7 @@ begin FForwardProcBodyInsertPolicy:=fpipInFrontOfMethods; FKeepForwardProcOrder:=true; FClassHeaderComments:=true; + FClassImplementationComments:=true; FMethodInsertPolicy:=mipClassOrder; FKeyWordPolicy:=wpLowerCase; FIdentifierPolicy:=wpNone; @@ -724,6 +734,7 @@ begin and (FForwardProcBodyInsertPolicy=CodeToolsOpts.ForwardProcBodyInsertPolicy) and (FKeepForwardProcOrder=CodeToolsOpts.KeepForwardProcOrder) and (FClassHeaderComments=CodeToolsOpts.ClassHeaderComments) + and (FClassImplementationComments=CodeToolsOpts.ClassImplementationComments) and (FMethodInsertPolicy=CodeToolsOpts.FMethodInsertPolicy) and (FKeyWordPolicy=CodeToolsOpts.FKeyWordPolicy) and (FIdentifierPolicy=CodeToolsOpts.FIdentifierPolicy) @@ -818,6 +829,7 @@ begin BeautifyCodeOptions.ForwardProcBodyInsertPolicy:=ForwardProcBodyInsertPolicy; BeautifyCodeOptions.KeepForwardProcOrder:=KeepForwardProcOrder; BeautifyCodeOptions.ClassHeaderComments:=ClassHeaderComments; + BeautifyCodeOptions.ClassImplementationComments:=ClassImplementationComments; BeautifyCodeOptions.MethodInsertPolicy:=MethodInsertPolicy; BeautifyCodeOptions.KeyWordPolicy:=KeyWordPolicy; BeautifyCodeOptions.IdentifierPolicy:=IdentifierPolicy; diff --git a/ide/frames/codetools_classcompletion_options.lfm b/ide/frames/codetools_classcompletion_options.lfm index ae1e67731e..5293c0ed41 100644 --- a/ide/frames/codetools_classcompletion_options.lfm +++ b/ide/frames/codetools_classcompletion_options.lfm @@ -77,20 +77,21 @@ inherited CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptions end object PropertyCompletionGroupBox: TGroupBox[4] AnchorSideLeft.Control = Owner + AnchorSideTop.Control = ClassImplementationCommentsCheckBox AnchorSideTop.Side = asrBottom AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom AnchorSideBottom.Side = asrBottom Left = 0 - Height = 194 - Top = 173 + Height = 193 + Top = 190 Width = 572 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 6 Caption = 'PropertyCompletionGroupBox' ClientHeight = 175 - ClientWidth = 568 + ClientWidth = 570 TabOrder = 4 object PropertyCompletionCheckBox: TCheckBox AnchorSideLeft.Control = PropertyCompletionGroupBox @@ -112,7 +113,7 @@ inherited CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptions Left = 6 Height = 135 Top = 34 - Width = 556 + Width = 558 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Around = 6 @@ -120,7 +121,7 @@ inherited CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptions ChildSizing.Layout = cclTopToBottomThenLeftToRight ChildSizing.ControlsPerLine = 5 ClientHeight = 135 - ClientWidth = 556 + ClientWidth = 558 TabOrder = 1 object SetPropertyVariablenameLabel: TLabel AnchorSideTop.Side = asrCenter @@ -234,4 +235,16 @@ inherited CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptions end end end + object ClassImplementationCommentsCheckBox: TCheckBox[5] + AnchorSideLeft.Control = Owner + AnchorSideTop.Control = ClassHeaderCommentsCheckBox + AnchorSideTop.Side = asrBottom + Left = 6 + Height = 22 + Top = 162 + Width = 293 + BorderSpacing.Around = 6 + Caption = 'ClassImplementationCommentsCheckBox' + TabOrder = 5 + end end diff --git a/ide/frames/codetools_classcompletion_options.lrs b/ide/frames/codetools_classcompletion_options.lrs index e3d179f2ba..a86be4d962 100644 --- a/ide/frames/codetools_classcompletion_options.lrs +++ b/ide/frames/codetools_classcompletion_options.lrs @@ -35,62 +35,67 @@ LazarusResources.Add('TCodetoolsClassCompletionOptionsFrame','FORMDATA',[ +'pertiesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height' +#2#22#3'Top'#3#134#0#5'Width'#3#239#0#20'BorderSpacing.Around'#2#6#7'Caption' +#6#27'ClassHeaderCommentsCheckBox'#8'TabOrder'#2#3#0#0#242#2#4#9'TGroupBox' - +#26'PropertyCompletionGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#18'Anc' - +'horSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'A' - +'nchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom' - +#4'Left'#2#0#6'Height'#3#194#0#3'Top'#3#173#0#5'Width'#3'<'#2#7'Anchors'#11#5 - +'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Cap' - +'tion'#6#26'PropertyCompletionGroupBox'#12'ClientHeight'#3#175#0#11'ClientWi' - +'dth'#3'8'#2#8'TabOrder'#2#4#0#9'TCheckBox'#26'PropertyCompletionCheckBox'#22 - +'AnchorSideLeft.Control'#7#26'PropertyCompletionGroupBox'#21'AnchorSideTop.C' - +'ontrol'#7#26'PropertyCompletionGroupBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2 - +#6#5'Width'#3#214#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'PropertyCom' - +'pletionCheckBox'#8'TabOrder'#2#0#0#0#6'TPanel'#17'PropPrefixesPanel'#22'Anc' - +'horSideLeft.Control'#7#26'PropertyCompletionGroupBox'#21'AnchorSideTop.Cont' - +'rol'#7#26'PropertyCompletionCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom' - +#23'AnchorSideRight.Control'#7#26'PropertyCompletionGroupBox'#20'AnchorSideR' - +'ight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#135#0#3'Top'#2'"'#5'Width' - +#3','#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'Borde' - +'rSpacing.Around'#2#6#10'BevelOuter'#7#6'bvNone'#18'ChildSizing.Layout'#7#29 - +'cclTopToBottomThenLeftToRight'#27'ChildSizing.ControlsPerLine'#2#5#12'Clien' - +'tHeight'#3#135#0#11'ClientWidth'#3','#2#8'TabOrder'#2#1#0#6'TLabel'#28'SetP' - +'ropertyVariablenameLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#7 - +#6'Height'#2#18#3'Top'#2#4#5'Width'#3#199#0#19'BorderSpacing.Right'#2#6'!Bor' - +'derSpacing.CellAlignHorizontal'#7#14'ccaRightBottom'#31'BorderSpacing.CellA' - +'lignVertical'#7#9'ccaCenter'#7'Caption'#6#28'SetPropertyVariablenameLabel' - +#11'ParentColor'#8#0#0#6'TLabel'#26'PrivateVariablePrefixLabel'#18'AnchorSid' - +'eTop.Side'#7#9'asrCenter'#4'Left'#2')'#6'Height'#2#18#3'Top'#2#31#5'Width'#3 - +#165#0#19'BorderSpacing.Right'#2#6'!BorderSpacing.CellAlignHorizontal'#7#14 + +#26'PropertyCompletionGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc' + +'horSideTop.Control'#7'#ClassImplementationCommentsCheckBox'#18'AnchorSideTo' + +'p.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide' + +'Right.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left' + +#2#0#6'Height'#3#193#0#3'Top'#3#190#0#5'Width'#3'<'#2#7'Anchors'#11#5'akTop' + +#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6 + +#26'PropertyCompletionGroupBox'#12'ClientHeight'#3#175#0#11'ClientWidth'#3':' + +#2#8'TabOrder'#2#4#0#9'TCheckBox'#26'PropertyCompletionCheckBox'#22'AnchorSi' + +'deLeft.Control'#7#26'PropertyCompletionGroupBox'#21'AnchorSideTop.Control'#7 + +#26'PropertyCompletionGroupBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Widt' + +'h'#3#214#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'PropertyCompletionC' + +'heckBox'#8'TabOrder'#2#0#0#0#6'TPanel'#17'PropPrefixesPanel'#22'AnchorSideL' + +'eft.Control'#7#26'PropertyCompletionGroupBox'#21'AnchorSideTop.Control'#7#26 + +'PropertyCompletionCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anchor' + +'SideRight.Control'#7#26'PropertyCompletionGroupBox'#20'AnchorSideRight.Side' + +#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#135#0#3'Top'#2'"'#5'Width'#3'.'#2#7 + +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.' + +'Around'#2#6#10'BevelOuter'#7#6'bvNone'#18'ChildSizing.Layout'#7#29'cclTopTo' + +'BottomThenLeftToRight'#27'ChildSizing.ControlsPerLine'#2#5#12'ClientHeight' + +#3#135#0#11'ClientWidth'#3'.'#2#8'TabOrder'#2#1#0#6'TLabel'#28'SetPropertyVa' + +'riablenameLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#7#6'Height' + +#2#18#3'Top'#2#4#5'Width'#3#199#0#19'BorderSpacing.Right'#2#6'!BorderSpacing' + +'.CellAlignHorizontal'#7#14'ccaRightBottom'#31'BorderSpacing.CellAlignVertic' + +'al'#7#9'ccaCenter'#7'Caption'#6#28'SetPropertyVariablenameLabel'#11'ParentC' + +'olor'#8#0#0#6'TLabel'#26'PrivateVariablePrefixLabel'#18'AnchorSideTop.Side' + +#7#9'asrCenter'#4'Left'#2')'#6'Height'#2#18#3'Top'#2#31#5'Width'#3#165#0#19 + +'BorderSpacing.Right'#2#6'!BorderSpacing.CellAlignHorizontal'#7#14'ccaRightB' + +'ottom'#31'BorderSpacing.CellAlignVertical'#7#9'ccaCenter'#7'Caption'#6#26'P' + +'rivateVariablePrefixLabel'#11'ParentColor'#8#0#0#6'TLabel'#31'PropertyStore' + +'dIdentPostfixLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#0#6'Hei' + ,'ght'#2#18#3'Top'#2':'#5'Width'#3#206#0#19'BorderSpacing.Right'#2#6'!BorderS' + +'pacing.CellAlignHorizontal'#7#14'ccaRightBottom'#31'BorderSpacing.CellAlign' + +'Vertical'#7#9'ccaCenter'#7'Caption'#6#31'PropertyStoredIdentPostfixLabel'#11 + +'ParentColor'#8#0#0#6'TLabel'#29'PropertyWriteIdentPrefixLabel'#18'AnchorSid' + +'eTop.Side'#7#9'asrCenter'#4'Left'#2#19#6'Height'#2#18#3'Top'#2'U'#5'Width'#3 + +#187#0#19'BorderSpacing.Right'#2#6'!BorderSpacing.CellAlignHorizontal'#7#14 +'ccaRightBottom'#31'BorderSpacing.CellAlignVertical'#7#9'ccaCenter'#7'Captio' - +'n'#6#26'PrivateVariablePrefixLabel'#11'ParentColor'#8#0#0#6'TLabel'#31'Prop' - +'ertyStoredIdentPostfixLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2 - +#0#6'Height'#2#18#3'Top'#2':'#5'Width'#3#206#0#19'BorderSpacing.Right'#2#6'!' - ,'BorderSpacing.CellAlignHorizontal'#7#14'ccaRightBottom'#31'BorderSpacing.Ce' - +'llAlignVertical'#7#9'ccaCenter'#7'Caption'#6#31'PropertyStoredIdentPostfixL' - +'abel'#11'ParentColor'#8#0#0#6'TLabel'#29'PropertyWriteIdentPrefixLabel'#18 - +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#19#6'Height'#2#18#3'Top'#2'U'#5 - +'Width'#3#187#0#19'BorderSpacing.Right'#2#6'!BorderSpacing.CellAlignHorizont' - +'al'#7#14'ccaRightBottom'#31'BorderSpacing.CellAlignVertical'#7#9'ccaCenter' - +#7'Caption'#6#29'PropertyWriteIdentPrefixLabel'#11'ParentColor'#8#0#0#6'TLab' - +'el'#28'PropertyReadIdentPrefixLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4 - +'Left'#2#19#6'Height'#2#18#3'Top'#2'p'#5'Width'#3#187#0#19'BorderSpacing.Rig' - +'ht'#2#6'!BorderSpacing.CellAlignHorizontal'#7#14'ccaRightBottom'#31'BorderS' - +'pacing.CellAlignVertical'#7#9'ccaCenter'#7'Caption'#6#28'PropertyReadIdentP' - +'refixLabel'#11'ParentColor'#8#0#0#5'TEdit'#27'SetPropertyVariablenameEdit' + +'n'#6#29'PropertyWriteIdentPrefixLabel'#11'ParentColor'#8#0#0#6'TLabel'#28'P' + +'ropertyReadIdentPrefixLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2 + +#19#6'Height'#2#18#3'Top'#2'p'#5'Width'#3#187#0#19'BorderSpacing.Right'#2#6 + +'!BorderSpacing.CellAlignHorizontal'#7#14'ccaRightBottom'#31'BorderSpacing.C' + +'ellAlignVertical'#7#9'ccaCenter'#7'Caption'#6#28'PropertyReadIdentPrefixLab' + +'el'#11'ParentColor'#8#0#0#5'TEdit'#27'SetPropertyVariablenameEdit'#18'Ancho' + +'rSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef' + +'t'#3#212#0#6'Height'#2#27#3'Top'#2#0#5'Width'#2'P'#8'TabOrder'#2#0#4'Text'#6 + +#27'SetPropertyVariablenameEdit'#0#0#5'TEdit'#25'PrivateVariablePrefixEdit' +#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBotto' - +'m'#4'Left'#3#212#0#6'Height'#2#27#3'Top'#2#0#5'Width'#2'P'#8'TabOrder'#2#0#4 - +'Text'#6#27'SetPropertyVariablenameEdit'#0#0#5'TEdit'#25'PrivateVariablePref' - +'ixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9 - +'asrBottom'#4'Left'#3#212#0#6'Height'#2#27#3'Top'#2#27#5'Width'#2'P'#8'TabOr' - +'der'#2#1#4'Text'#6#25'PrivateVariablePrefixEdit'#0#0#5'TEdit'#30'PropertySt' - +'oredIdentPostfixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRi' - +'ght.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#27#3'Top'#2'6'#5'Width' - +#2'P'#8'TabOrder'#2#2#4'Text'#6#30'PropertyStoredIdentPostfixEdit'#0#0#5'TEd' - +'it'#28'PropertyWriteIdentPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom' + +'m'#4'Left'#3#212#0#6'Height'#2#27#3'Top'#2#27#5'Width'#2'P'#8'TabOrder'#2#1 + +#4'Text'#6#25'PrivateVariablePrefixEdit'#0#0#5'TEdit'#30'PropertyStoredIdent' + +'PostfixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side' + +#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#27#3'Top'#2'6'#5'Width'#2'P'#8'T' + +'abOrder'#2#2#4'Text'#6#30'PropertyStoredIdentPostfixEdit'#0#0#5'TEdit'#28'P' + +'ropertyWriteIdentPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'Ancho' + +'rSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#27#3'Top'#2'Q'#5 + +'Width'#2'P'#8'TabOrder'#2#3#4'Text'#6#28'PropertyWriteIdentPrefixEdit'#0#0#5 + +'TEdit'#27'PropertyReadIdentPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom' +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#27#3'To' - +'p'#2'Q'#5'Width'#2'P'#8'TabOrder'#2#3#4'Text'#6#28'PropertyWriteIdentPrefix' - +'Edit'#0#0#5'TEdit'#27'PropertyReadIdentPrefixEdit'#18'AnchorSideTop.Side'#7 - +#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Heig' - +'ht'#2#27#3'Top'#2'l'#5'Width'#2'P'#8'TabOrder'#2#4#4'Text'#6#27'PropertyRea' - +'dIdentPrefixEdit'#0#0#0#0#0 + +'p'#2'l'#5'Width'#2'P'#8'TabOrder'#2#4#4'Text'#6#27'PropertyReadIdentPrefixE' + +'dit'#0#0#0#0#242#2#5#9'TCheckBox#ClassImplementationCommentsCheckBox'#22'An' + +'chorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'ClassHeader' + +'CommentsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heigh' + +'t'#2#22#3'Top'#3#162#0#5'Width'#3'%'#1#20'BorderSpacing.Around'#2#6#7'Capti' + +'on'#6'#ClassImplementationCommentsCheckBox'#8'TabOrder'#2#5#0#0#0 ]); diff --git a/ide/frames/codetools_classcompletion_options.pas b/ide/frames/codetools_classcompletion_options.pas index 28e175a38d..cd1d1ff48c 100644 --- a/ide/frames/codetools_classcompletion_options.pas +++ b/ide/frames/codetools_classcompletion_options.pas @@ -34,6 +34,7 @@ type TCodetoolsClassCompletionOptionsFrame = class(TAbstractIDEOptionsEditor) ClassHeaderCommentsCheckBox: TCheckBox; + ClassImplementationCommentsCheckBox: TCheckBox; ClassPartInsertPolicyRadioGroup: TRadioGroup; MethodInsertPolicyRadioGroup: TRadioGroup; MixMethodsAndPropertiesCheckBox: TCheckBox; @@ -96,29 +97,15 @@ begin end; end; - with ClassHeaderCommentsCheckBox do - Caption:=lisHeaderCommentForClass; - - with PropertyCompletionGroupBox do - Caption:=dlgPropertyCompletion; - - with PropertyCompletionCheckBox do - Caption:=dlgCompleteProperties; - - with PropertyReadIdentPrefixLabel do - Caption:=dlgCDTReadPrefix; - - with PropertyWriteIdentPrefixLabel do - Caption:=dlgCDTWritePrefix; - - with PropertyStoredIdentPostfixLabel do - Caption:=dlgCDTStoredPostfix; - - with PrivateVariablePrefixLabel do - Caption:=dlgCDTVariablePrefix; - - with SetPropertyVariablenameLabel do - Caption:=dlgSetPropertyVariable; + ClassHeaderCommentsCheckBox.Caption:=lisHeaderCommentForClass; + ClassImplementationCommentsCheckBox.Caption:=lisImplementationCommentForClass; + PropertyCompletionGroupBox.Caption:=dlgPropertyCompletion; + PropertyCompletionCheckBox.Caption:=dlgCompleteProperties; + PropertyReadIdentPrefixLabel.Caption:=dlgCDTReadPrefix; + PropertyWriteIdentPrefixLabel.Caption:=dlgCDTWritePrefix; + PropertyStoredIdentPostfixLabel.Caption:=dlgCDTStoredPostfix; + PrivateVariablePrefixLabel.Caption:=dlgCDTVariablePrefix; + SetPropertyVariablenameLabel.Caption:=dlgSetPropertyVariable; end; procedure TCodetoolsClassCompletionOptionsFrame.ReadSettings( @@ -137,6 +124,7 @@ begin MixMethodsAndPropertiesCheckBox.Checked := MixMethodsAndProperties; ClassHeaderCommentsCheckBox.Checked := ClassHeaderComments; + ClassImplementationCommentsCheckBox.Checked := ClassImplementationComments; case MethodInsertPolicy of mipAlphabetically: MethodInsertPolicyRadioGroup.ItemIndex:=0; @@ -169,6 +157,7 @@ begin MixMethodsAndProperties := MixMethodsAndPropertiesCheckBox.Checked; ClassHeaderComments := ClassHeaderCommentsCheckBox.Checked; + ClassImplementationComments := ClassImplementationCommentsCheckBox.Checked; case MethodInsertPolicyRadioGroup.ItemIndex of 0: MethodInsertPolicy := mipAlphabetically; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 56715924c6..70a5461b09 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -1490,6 +1490,7 @@ resourcestring dlgIdentifierPolicy = 'Identifier policy'; dlgPropertyCompletion = 'Property completion'; lisHeaderCommentForClass = 'Header comment for class'; + lisImplementationCommentForClass = 'Implementation comment for class'; dlgCompleteProperties = 'Complete properties'; dlgCDTReadPrefix = 'Read prefix'; dlgCDTWritePrefix = 'Write prefix';