paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-13 06:09:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: options: added frame for class completion

Browse Source 
git-svn-id: trunk@19780 -
This commit is contained in:
mattias 2009-05-03 11:08:54 +00:00
parent 018eab6b38
commit 14bd4ea660
12 changed files with 693 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -2645,6 +2645,9 @@ ide/frames/codeexplorer_update_options.pas svneol=native#text/pascal
ide/frames/codeobserver_options.lfm svneol=native#text/plain ide/frames/codeobserver_options.lfm svneol=native#text/plain
ide/frames/codeobserver_options.lrs svneol=native#text/pascal ide/frames/codeobserver_options.lrs svneol=native#text/pascal
ide/frames/codeobserver_options.pas svneol=native#text/pascal ide/frames/codeobserver_options.pas svneol=native#text/pascal
ide/frames/codetools_classcompletion_options.lfm svneol=native#text/plain
ide/frames/codetools_classcompletion_options.lrs svneol=native#text/plain
ide/frames/codetools_classcompletion_options.pas svneol=native#text/plain
ide/frames/codetools_codecreation_options.lfm svneol=native#text/plain ide/frames/codetools_codecreation_options.lfm svneol=native#text/plain
ide/frames/codetools_codecreation_options.lrs svneol=native#text/pascal ide/frames/codetools_codecreation_options.lrs svneol=native#text/pascal
ide/frames/codetools_codecreation_options.pas svneol=native#text/pascal ide/frames/codetools_codecreation_options.pas svneol=native#text/pascal

17
components/codetools/sourcechanger.pas
View File

@ -274,7 +274,14 @@ const
shortstring = shortstring =
('Last', 'InFrontOfMethods', 'BehindMethods'); ('Last', 'InFrontOfMethods', 'BehindMethods');
UsesInsertPolicyNames: array[TUsesInsertPolicy] of shortstring = (
'First',
'InFrontOfRelated',
'BehindRelated',
'Last',
'Alphabetically'
);
DefaultDoNotSplitLineInFront: TAtomTypes = DefaultDoNotSplitLineInFront: TAtomTypes =
[atColon,atComma,atSemicolon,atPoint]; [atColon,atComma,atSemicolon,atPoint];
DefaultDoNotSplitLineAfter: TAtomTypes = [atColon,atAt,atPoint,atKeyWord]; DefaultDoNotSplitLineAfter: TAtomTypes = [atColon,atAt,atPoint,atKeyWord];
@ -290,6 +297,7 @@ function ClassPartPolicyNameToPolicy(const s: string): TClassPartInsertPolicy;
function MethodInsertPolicyNameToPolicy(const s: string): TMethodInsertPolicy; function MethodInsertPolicyNameToPolicy(const s: string): TMethodInsertPolicy;
function ForwardProcBodyInsertPolicyNameToPolicy( function ForwardProcBodyInsertPolicyNameToPolicy(
const s: string): TForwardProcBodyInsertPolicy; const s: string): TForwardProcBodyInsertPolicy;
function UsesInsertPolicyNameToPolicy(const s: string): TUsesInsertPolicy;
implementation implementation
@ -348,6 +356,13 @@ begin
Result:=fpipBehindMethods; Result:=fpipBehindMethods;
end; end;
function UsesInsertPolicyNameToPolicy(const s: string): TUsesInsertPolicy;
begin
for Result:=Low(TUsesInsertPolicy) to High(TUsesInsertPolicy) do
if SysUtils.CompareText(UsesInsertPolicyNames[Result],s)=0 then exit;
Result:=uipInFrontOfRelated;
end;
function CompareSourceChangeCacheEntry(NodeData1, NodeData2: pointer): integer; function CompareSourceChangeCacheEntry(NodeData1, NodeData2: pointer): integer;
var var
Entry1, Entry2: TSourceChangeCacheEntry; Entry1, Entry2: TSourceChangeCacheEntry;

15
ide/codetoolsoptions.pas
View File

@ -86,6 +86,7 @@ type
// identifier completion // identifier completion
FIdentComplAddSemicolon: Boolean; FIdentComplAddSemicolon: Boolean;
FUsesInsertPolicy: TUsesInsertPolicy;
procedure SetFilename(const AValue: string); procedure SetFilename(const AValue: string);
public public
constructor Create; constructor Create;
@ -160,6 +161,8 @@ type
read FPrivateVariablePrefix write FPrivateVariablePrefix; read FPrivateVariablePrefix write FPrivateVariablePrefix;
property SetPropertyVariablename: string property SetPropertyVariablename: string
read FSetPropertyVariablename write FSetPropertyVariablename; read FSetPropertyVariablename write FSetPropertyVariablename;
property UsesInsertPolicy: TUsesInsertPolicy
read FUsesInsertPolicy write FUsesInsertPolicy;
// identifier completion // identifier completion
property IdentComplAddSemicolon: Boolean read FIdentComplAddSemicolon property IdentComplAddSemicolon: Boolean read FIdentComplAddSemicolon
@ -365,7 +368,10 @@ begin
'CodeToolsOptions/PrivateVariablePrefix/Value',''),'F'); 'CodeToolsOptions/PrivateVariablePrefix/Value',''),'F');
FSetPropertyVariablename:=ReadIdentifier(XMLConfig.GetValue( FSetPropertyVariablename:=ReadIdentifier(XMLConfig.GetValue(
'CodeToolsOptions/SetPropertyVariablename/Value',''),'AValue'); 'CodeToolsOptions/SetPropertyVariablename/Value',''),'AValue');
FUsesInsertPolicy:=UsesInsertPolicyNameToPolicy(XMLConfig.GetValue(
'CodeToolsOptions/UsesInsertPolicy/Value',
UsesInsertPolicyNames[uipInFrontOfRelated]));
// identifier completion // identifier completion
FIdentComplAddSemicolon:=XMLConfig.GetValue( FIdentComplAddSemicolon:=XMLConfig.GetValue(
'CodeToolsOptions/IdentifierCompletion/AddSemicolon',true); 'CodeToolsOptions/IdentifierCompletion/AddSemicolon',true);
@ -464,6 +470,9 @@ begin
FPrivateVariablePrefix,'F'); FPrivateVariablePrefix,'F');
XMLConfig.SetDeleteValue('CodeToolsOptions/SetPropertyVariablename/Value', XMLConfig.SetDeleteValue('CodeToolsOptions/SetPropertyVariablename/Value',
FSetPropertyVariablename,'AValue'); FSetPropertyVariablename,'AValue');
XMLConfig.SetDeleteValue('CodeToolsOptions/UsesInsertPolicy/Value',
UsesInsertPolicyNames[FUsesInsertPolicy],
UsesInsertPolicyNames[uipInFrontOfRelated]);
// identifier completion // identifier completion
XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/AddSemicolon', XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/AddSemicolon',
@ -547,6 +556,7 @@ begin
FPropertyStoredIdentPostfix:=CodeToolsOpts.FPropertyStoredIdentPostfix; FPropertyStoredIdentPostfix:=CodeToolsOpts.FPropertyStoredIdentPostfix;
FPrivateVariablePrefix:=CodeToolsOpts.FPrivateVariablePrefix; FPrivateVariablePrefix:=CodeToolsOpts.FPrivateVariablePrefix;
FSetPropertyVariablename:=CodeToolsOpts.FSetPropertyVariablename; FSetPropertyVariablename:=CodeToolsOpts.FSetPropertyVariablename;
FUsesInsertPolicy:=CodeToolsOpts.FUsesInsertPolicy;
// identifier completion // identifier completion
FIdentComplAddSemicolon:=CodeToolsOpts.FIdentComplAddSemicolon; FIdentComplAddSemicolon:=CodeToolsOpts.FIdentComplAddSemicolon;
@ -592,6 +602,7 @@ begin
FPropertyStoredIdentPostfix:='IsStored'; FPropertyStoredIdentPostfix:='IsStored';
FPrivateVariablePrefix:='f'; FPrivateVariablePrefix:='f';
FSetPropertyVariablename:='AValue'; FSetPropertyVariablename:='AValue';
FUsesInsertPolicy:=uipInFrontOfRelated;
// identifier completion // identifier completion
FIdentComplAddSemicolon:=true; FIdentComplAddSemicolon:=true;
@ -644,6 +655,7 @@ begin
and (FPropertyStoredIdentPostfix=CodeToolsOpts.FPropertyStoredIdentPostfix) and (FPropertyStoredIdentPostfix=CodeToolsOpts.FPropertyStoredIdentPostfix)
and (FPrivateVariablePrefix=CodeToolsOpts.FPrivateVariablePrefix) and (FPrivateVariablePrefix=CodeToolsOpts.FPrivateVariablePrefix)
and (FSetPropertyVariablename=CodeToolsOpts.FSetPropertyVariablename) and (FSetPropertyVariablename=CodeToolsOpts.FSetPropertyVariablename)
and (FUsesInsertPolicy=CodeToolsOpts.FUsesInsertPolicy)
; ;
end; end;
@ -704,6 +716,7 @@ begin
BeautifyCodeOptions.PropertyWriteIdentPrefix:=PropertyWriteIdentPrefix; BeautifyCodeOptions.PropertyWriteIdentPrefix:=PropertyWriteIdentPrefix;
BeautifyCodeOptions.PropertyStoredIdentPostfix:=PropertyStoredIdentPostfix; BeautifyCodeOptions.PropertyStoredIdentPostfix:=PropertyStoredIdentPostfix;
BeautifyCodeOptions.PrivateVariablePrefix:=PrivateVariablePrefix; BeautifyCodeOptions.PrivateVariablePrefix:=PrivateVariablePrefix;
BeautifyCodeOptions.UsesInsertPolicy:=UsesInsertPolicy;
end end
else else
inherited AssignTo(Dest); inherited AssignTo(Dest);

242
ide/frames/codetools_classcompletion_options.lfm Normal file
View File

@ -0,0 +1,242 @@
inherited CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFrame
Height = 377
Width = 572
ClientHeight = 373
ClientWidth = 568
TabOrder = 0
Visible = False
DesignLeft = 334
DesignTop = 307
object ClassPartInsertPolicyRadioGroup: TRadioGroup[0]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 0
Height = 100
Top = 0
Width = 254
AutoFill = True
Caption = 'ClassPartInsertPolicyRadioGroup'
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 MethodInsertPolicyRadioGroup: TRadioGroup[1]
AnchorSideLeft.Control = ClassPartInsertPolicyRadioGroup
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 260
Height = 100
Top = 0
Width = 308
Anchors = [akTop, akLeft, akRight]
AutoFill = True
BorderSpacing.Left = 6
Caption = 'MethodInsertPolicyRadioGroup'
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 MixMethodsAndPropertiesCheckBox: TCheckBox[2]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ClassPartInsertPolicyRadioGroup
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 106
Width = 253
BorderSpacing.Around = 6
Caption = 'MixMethodsAndPropertiesCheckBox'
TabOrder = 2
end
object ClassHeaderCommentsCheckBox: TCheckBox[3]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MixMethodsAndPropertiesCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 134
Width = 239
BorderSpacing.Around = 6
Caption = 'ClassHeaderCommentsCheckBox'
TabOrder = 3
end
object PropertyCompletionGroupBox: TGroupBox[4]
AnchorSideLeft.Control = Owner
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Side = asrBottom
Left = 0
Height = 193
Top = 173
Width = 568
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Caption = 'PropertyCompletionGroupBox'
ClientHeight = 174
ClientWidth = 564
TabOrder = 4
object PropertyReadIdentPrefixLabel: TLabel
AnchorSideTop.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyReadIdentPrefixEdit
Left = -27
Height = 18
Top = 32
Width = 187
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PropertyReadIdentPrefixLabel'
ParentColor = False
end
object PropertyWriteIdentPrefixLabel: TLabel
AnchorSideTop.Control = PropertyWriteIdentPrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyWriteIdentPrefixEdit
Left = -27
Height = 18
Top = 59
Width = 187
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PropertyWriteIdentPrefixLabel'
ParentColor = False
end
object PropertyStoredIdentPostfixLabel: TLabel
AnchorSideTop.Control = PropertyStoredIdentPostfixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyStoredIdentPostfixEdit
Left = -46
Height = 18
Top = 86
Width = 206
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PropertyStoredIdentPostfixLabel'
ParentColor = False
end
object PrivateVariablePrefixLabel: TLabel
AnchorSideTop.Control = PrivateVariablePrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PrivateVariablePrefixEdit
Left = -5
Height = 18
Top = 113
Width = 165
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PrivateVariablePrefixLabel'
ParentColor = False
end
object SetPropertyVariablenameLabel: TLabel
AnchorSideTop.Control = SetPropertyVariablenameEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = SetPropertyVariablenameEdit
Left = -39
Height = 18
Top = 140
Width = 199
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'SetPropertyVariablenameLabel'
ParentColor = False
end
object PropertyCompletionCheckBox: TCheckBox
AnchorSideLeft.Control = PropertyCompletionGroupBox
AnchorSideTop.Control = PropertyCompletionGroupBox
Left = 6
Height = 22
Top = 6
Width = 214
BorderSpacing.Around = 6
Caption = 'PropertyCompletionCheckBox'
TabOrder = 0
end
object PropertyReadIdentPrefixEdit: TEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
Left = 166
Height = 27
Top = 28
Width = 80
AutoSize = True
TabOrder = 1
Text = 'PropertyReadIdentPrefixEdit'
end
object PropertyWriteIdentPrefixEdit: TEdit
AnchorSideLeft.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = PropertyReadIdentPrefixEdit
AnchorSideRight.Side = asrBottom
Left = 166
Height = 27
Top = 55
Width = 80
Anchors = [akTop, akLeft, akRight]
AutoSize = True
TabOrder = 2
Text = 'PropertyWriteIdentPrefixEdit'
end
object PropertyStoredIdentPostfixEdit: TEdit
AnchorSideLeft.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Control = PropertyWriteIdentPrefixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = PropertyReadIdentPrefixEdit
AnchorSideRight.Side = asrBottom
Left = 166
Height = 27
Top = 82
Width = 80
Anchors = [akTop, akLeft, akRight]
AutoSize = True
TabOrder = 3
Text = 'PropertyStoredIdentPostfixEdit'
end
object PrivateVariablePrefixEdit: TEdit
AnchorSideLeft.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Control = PropertyStoredIdentPostfixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = PropertyReadIdentPrefixEdit
AnchorSideRight.Side = asrBottom
Left = 166
Height = 27
Top = 109
Width = 80
Anchors = [akTop, akLeft, akRight]
AutoSize = True
TabOrder = 4
Text = 'PrivateVariablePrefixEdit'
end
object SetPropertyVariablenameEdit: TEdit
AnchorSideLeft.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Control = PrivateVariablePrefixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = PropertyReadIdentPrefixEdit
AnchorSideRight.Side = asrBottom
Left = 166
Height = 27
Top = 136
Width = 80
Anchors = [akTop, akLeft, akRight]
AutoSize = True
TabOrder = 5
Text = 'SetPropertyVariablenameEdit'
end
end
end

104
ide/frames/codetools_classcompletion_options.lrs Normal file
View File

@ -0,0 +1,104 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TCodetoolsClassCompletionOptionsFrame','FORMDATA',[
'TPF0'#241'%TCodetoolsClassCompletionOptionsFrame$CodetoolsClassCompletionOpt'
+'ionsFrame'#6'Height'#3'y'#1#5'Width'#3'<'#2#12'ClientHeight'#3'u'#1#11'Clie'
+'ntWidth'#3'8'#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'N'#1#9'Design'
+'Top'#3'3'#1#0#242#2#0#11'TRadioGroup'#31'ClassPartInsertPolicyRadioGroup'#22
+'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#20
+'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2'd'#3'Top'#2#0#5
+'Width'#3#254#0#8'AutoFill'#9#7'Caption'#6#31'ClassPartInsertPolicyRadioGrou'
+'p'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6
+#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSi'
+'zing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkH'
+'orizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScal'
+'eChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'Chil'
+'dSizing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#242#2#1#11'TRadioGroup'#28
+'MethodInsertPolicyRadioGroup'#22'AnchorSideLeft.Control'#7#31'ClassPartInse'
+'rtPolicyRadioGroup'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop'
+'.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
+'ght.Side'#7#9'asrBottom'#4'Left'#3#4#1#6'Height'#2'd'#3'Top'#2#0#5'Width'#3
+'4'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#18'BorderS'
+'pacing.Left'#2#6#7'Caption'#6#28'MethodInsertPolicyRadioGroup'#28'ChildSizi'
+'ng.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizin'
+'g.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeV'
+'ertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
+#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
+'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr'
+'olsPerLine'#2#1#8'TabOrder'#2#1#0#0#242#2#2#9'TCheckBox'#31'MixMethodsAndPr'
+'opertiesCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+'ntrol'#7#31'ClassPartInsertPolicyRadioGroup'#18'AnchorSideTop.Side'#7#9'asr'
+'Bottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'j'#5'Width'#3#253#0#20'BorderSp'
+'acing.Around'#2#6#7'Caption'#6#31'MixMethodsAndPropertiesCheckBox'#8'TabOrd'
+'er'#2#2#0#0#242#2#3#9'TCheckBox'#27'ClassHeaderCommentsCheckBox'#22'AnchorS'
+'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#31'MixMethodsAndPro'
+'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#193#0#3'Top'#3#173#0#5'Width'#3'8'#2#7'Anchors'#11#5
+'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'Pro'
+'pertyCompletionGroupBox'#12'ClientHeight'#3#174#0#11'ClientWidth'#3'4'#2#8
+'TabOrder'#2#4#0#6'TLabel'#28'PropertyReadIdentPrefixLabel'#21'AnchorSideTop'
+'.Control'#7#27'PropertyReadIdentPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrC'
+'enter'#23'AnchorSideRight.Control'#7#27'PropertyReadIdentPrefixEdit'#4'Left'
+#2#229#6'Height'#2#18#3'Top'#2' '#5'Width'#3#187#0#7'Anchors'#11#5'akTop'#7
+'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#28'PropertyReadIdentPre'
+'fixLabel'#11'ParentColor'#8#0#0#6'TLabel'#29'PropertyWriteIdentPrefixLabel'
+#21'AnchorSideTop.Control'#7#28'PropertyWriteIdentPrefixEdit'#18'AnchorSideT'
+'op.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#28'PropertyWriteIdent'
+'PrefixEdit'#4'Left'#2#229#6'Height'#2#18#3'Top'#2';'#5'Width'#3#187#0#7'Anc'
+'hors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#29
+'PropertyWriteIdentPrefixLabel'#11'ParentColor'#8#0#0#6'TLabel'#31'PropertyS'
+'toredIdentPostfixLabel'#21'AnchorSideTop.Control'#7#30'PropertyStoredIdentP'
+'ostfixEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Contro'
+'l'#7#30'PropertyStoredIdentPostfixEdit'#4'Left'#2#210#6'Height'#2#18#3'Top'
+#2'V'#5'Width'#3#206#0#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.'
+'Right'#2#6#7'Caption'#6#31'PropertyStoredIdentPostfixLabel'#11'ParentColor'
+#8#0#0#6'TLabel'#26'PrivateVariablePrefixLabel'#21'AnchorSideTop.Control'#7
+#25'PrivateVariablePrefixEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anch'
+'orSideRight.Control'#7#25'PrivateVariablePrefixEdit'#4'Left'#2#251#6'Height'
+#2#18#3'Top'#2'q'#5'Width'#3#165#0#7'Anchors'#11#5'akTop'#7'akRight'#0#19'Bo'
+'rderSpacing.Right'#2#6#7'Caption'#6#26'PrivateVariablePrefixLabel'#11'Paren'
+'tColor'#8#0#0#6'TLabel'#28'SetPropertyVariablenameLabel'#21'AnchorSideTop.C'
+'ontrol'#7#27'SetPropertyVariablenameEdit'#18'AnchorSideTop.Side'#7#9'asrCen'
+'ter'#23'AnchorSideRight.Control'#7#27'SetPropertyVariablenameEdit'#4'Left'#2
,#217#6'Height'#2#18#3'Top'#3#140#0#5'Width'#3#199#0#7'Anchors'#11#5'akTop'#7
+'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#28'SetPropertyVariablen'
+'ameLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#26'PropertyCompletionCheckBox'
+#22'AnchorSideLeft.Control'#7#26'PropertyCompletionGroupBox'#21'AnchorSideTo'
+'p.Control'#7#26'PropertyCompletionGroupBox'#4'Left'#2#6#6'Height'#2#22#3'To'
+'p'#2#6#5'Width'#3#214#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'Proper'
+'tyCompletionCheckBox'#8'TabOrder'#2#0#0#0#5'TEdit'#27'PropertyReadIdentPref'
+'ixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9
+'asrBottom'#4'Left'#3#166#0#6'Height'#2#27#3'Top'#2#28#5'Width'#2'P'#8'AutoS'
+'ize'#9#8'TabOrder'#2#1#4'Text'#6#27'PropertyReadIdentPrefixEdit'#0#0#5'TEdi'
+'t'#28'PropertyWriteIdentPrefixEdit'#22'AnchorSideLeft.Control'#7#27'Propert'
+'yReadIdentPrefixEdit'#21'AnchorSideTop.Control'#7#27'PropertyReadIdentPrefi'
+'xEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+#27'PropertyReadIdentPrefixEdit'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+'eft'#3#166#0#6'Height'#2#27#3'Top'#2'7'#5'Width'#2'P'#7'Anchors'#11#5'akTop'
+#6'akLeft'#7'akRight'#0#8'AutoSize'#9#8'TabOrder'#2#2#4'Text'#6#28'PropertyW'
+'riteIdentPrefixEdit'#0#0#5'TEdit'#30'PropertyStoredIdentPostfixEdit'#22'Anc'
+'horSideLeft.Control'#7#27'PropertyReadIdentPrefixEdit'#21'AnchorSideTop.Con'
+'trol'#7#28'PropertyWriteIdentPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBott'
+'om'#23'AnchorSideRight.Control'#7#27'PropertyReadIdentPrefixEdit'#20'Anchor'
+'SideRight.Side'#7#9'asrBottom'#4'Left'#3#166#0#6'Height'#2#27#3'Top'#2'R'#5
+'Width'#2'P'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#8'T'
+'abOrder'#2#3#4'Text'#6#30'PropertyStoredIdentPostfixEdit'#0#0#5'TEdit'#25'P'
+'rivateVariablePrefixEdit'#22'AnchorSideLeft.Control'#7#27'PropertyReadIdent'
+'PrefixEdit'#21'AnchorSideTop.Control'#7#30'PropertyStoredIdentPostfixEdit'
+#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#27'Prop'
+'ertyReadIdentPrefixEdit'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
+#166#0#6'Height'#2#27#3'Top'#2'm'#5'Width'#2'P'#7'Anchors'#11#5'akTop'#6'akL'
+'eft'#7'akRight'#0#8'AutoSize'#9#8'TabOrder'#2#4#4'Text'#6#25'PrivateVariabl'
+'ePrefixEdit'#0#0#5'TEdit'#27'SetPropertyVariablenameEdit'#22'AnchorSideLeft'
+'.Control'#7#27'PropertyReadIdentPrefixEdit'#21'AnchorSideTop.Control'#7#25
+'PrivateVariablePrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorS'
+'ideRight.Control'#7#27'PropertyReadIdentPrefixEdit'#20'AnchorSideRight.Side'
+#7#9'asrBottom'#4'Left'#3#166#0#6'Height'#2#27#3'Top'#3#136#0#5'Width'#2'P'#7
+'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#8'TabOrder'#2#5#4
+'Text'#6#27'SetPropertyVariablenameEdit'#0#0#0#0
]);

201
ide/frames/codetools_classcompletion_options.pas Normal file
View File

@ -0,0 +1,201 @@
{
***************************************************************************
* *
* This source is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This code is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* General Public License for more details. *
* *
* A copy of the GNU General Public License is available on the World *
* Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also *
* obtain it by writing to the Free Software Foundation, *
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* *
***************************************************************************
}
unit codetools_classcompletion_options;
{$mode objfpc}{$H+}
interface
uses
Classes, SysUtils, FileUtil, LResources, Forms, ExtCtrls, StdCtrls,
SourceChanger, CodeToolsOptions, LazarusIDEStrConsts, IDEOptionsIntf;
type
{ TCodetoolsClassCompletionOptionsFrame }
TCodetoolsClassCompletionOptionsFrame = class(TAbstractIDEOptionsEditor)
ClassHeaderCommentsCheckBox: TCheckBox;
ClassPartInsertPolicyRadioGroup: TRadioGroup;
MethodInsertPolicyRadioGroup: TRadioGroup;
MixMethodsAndPropertiesCheckBox: TCheckBox;
PrivateVariablePrefixEdit: TEdit;
PrivateVariablePrefixLabel: TLabel;
PropertyCompletionCheckBox: TCheckBox;
PropertyCompletionGroupBox: TGroupBox;
PropertyReadIdentPrefixEdit: TEdit;
PropertyReadIdentPrefixLabel: TLabel;
PropertyStoredIdentPostfixEdit: TEdit;
PropertyStoredIdentPostfixLabel: TLabel;
PropertyWriteIdentPrefixEdit: TEdit;
PropertyWriteIdentPrefixLabel: TLabel;
SetPropertyVariablenameEdit: TEdit;
SetPropertyVariablenameLabel: TLabel;
private
{ private declarations }
public
function GetTitle: String; override;
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
procedure ReadSettings(AOptions: TAbstractIDEOptions); override;
procedure WriteSettings(AOptions: TAbstractIDEOptions); override;
class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;
end;
implementation
{ TCodetoolsClassCompletionOptionsFrame }
function TCodetoolsClassCompletionOptionsFrame.GetTitle: String;
begin
Result := lisClassCompletion;
end;
procedure TCodetoolsClassCompletionOptionsFrame.Setup(
ADialog: TAbstractOptionsEditorDialog);
begin
with ClassPartInsertPolicyRadioGroup do begin
Caption:=dlgClassInsertPolicy;
with Items do begin
BeginUpdate;
Add(dlgAlphabetically);
Add(dlgCDTLast);
EndUpdate;
end;
end;
with MixMethodsAndPropertiesCheckBox do
Caption:=dlgMixMethodsAndProperties;
with MethodInsertPolicyRadioGroup do begin
Caption:=dlgMethodInsPolicy;
with Items do begin
BeginUpdate;
Add(dlgAlphabetically);
Add(dlgCDTLast);
Add(dlgCDTClassOrder);
EndUpdate;
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;
end;
procedure TCodetoolsClassCompletionOptionsFrame.ReadSettings(
AOptions: TAbstractIDEOptions);
begin
with AOptions as TCodetoolsOptions do
begin
case ClassPartInsertPolicy of
cpipAlphabetically:
ClassPartInsertPolicyRadioGroup.ItemIndex:=0;
else
// cpipLast
ClassPartInsertPolicyRadioGroup.ItemIndex:=1;
end;
MixMethodsAndPropertiesCheckBox.Checked := MixMethodsAndProperties;
ClassHeaderCommentsCheckBox.Checked := ClassHeaderComments;
case MethodInsertPolicy of
mipAlphabetically:
MethodInsertPolicyRadioGroup.ItemIndex:=0;
mipLast:
MethodInsertPolicyRadioGroup.ItemIndex:=1;
else
// mipClassOrder
MethodInsertPolicyRadioGroup.ItemIndex:=2;
end;
PropertyCompletionCheckBox.Checked := CompleteProperties;
PropertyReadIdentPrefixEdit.Text := PropertyReadIdentPrefix;
PropertyWriteIdentPrefixEdit.Text := PropertyWriteIdentPrefix;
PropertyStoredIdentPostfixEdit.Text := PropertyStoredIdentPostfix;
PrivateVariablePrefixEdit.Text := PrivateVariablePrefix;
SetPropertyVariablenameEdit.Text := SetPropertyVariablename;
end;
end;
procedure TCodetoolsClassCompletionOptionsFrame.WriteSettings(
AOptions: TAbstractIDEOptions);
begin
with AOptions as TCodetoolsOptions do
begin
case ClassPartInsertPolicyRadioGroup.ItemIndex of
0: ClassPartInsertPolicy := cpipAlphabetically;
1: ClassPartInsertPolicy := cpipLast;
end;
MixMethodsAndProperties := MixMethodsAndPropertiesCheckBox.Checked;
ClassHeaderComments := ClassHeaderCommentsCheckBox.Checked;
case MethodInsertPolicyRadioGroup.ItemIndex of
0: MethodInsertPolicy := mipAlphabetically;
1: MethodInsertPolicy := mipLast;
2: MethodInsertPolicy := mipClassOrder;
end;
CompleteProperties:=PropertyCompletionCheckBox.Checked;
PropertyReadIdentPrefix :=
ReadIdentifier(PropertyReadIdentPrefixEdit.Text,'Get');
PropertyWriteIdentPrefix :=
ReadIdentifier(PropertyWriteIdentPrefixEdit.Text,'Set');
PropertyStoredIdentPostfix :=
ReadIdentifier(PropertyStoredIdentPostfixEdit.Text,'IsStored');
PrivateVariablePrefix :=
ReadIdentifier(PrivateVariablePrefixEdit.Text,'F');
SetPropertyVariablename :=
ReadIdentifier(SetPropertyVariablenameEdit.Text,'AValue');
end;
end;
class function TCodetoolsClassCompletionOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
begin
Result := TCodeToolsOptions;
end;
initialization
{$I codetools_classcompletion_options.lrs}
RegisterIDEOptionsEditor(GroupCodetools, TCodetoolsClassCompletionOptionsFrame, CdtOptionsClassCompletion);
end.

272
ide/frames/codetools_codecreation_options.lfm
View File

@ -1,20 +1,25 @@
inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
Height = 377 Height = 377
Width = 572 Width = 572
ClientHeight = 377 ClientHeight = 373
ClientWidth = 572 ClientWidth = 568
TabOrder = 0 TabOrder = 0
Visible = False Visible = False
DesignLeft = 44 DesignLeft = 313
DesignTop = 58 DesignTop = 275
object ClassPartInsertPolicyRadioGroup: TRadioGroup[0] object ForwardProcsInsertPolicyRadioGroup: TRadioGroup[0]
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6
Height = 100 Height = 100
Width = 254 Top = 6
Width = 556
Anchors = [akTop, akLeft, akRight]
AutoFill = True AutoFill = True
Caption = 'ClassPartInsertPolicyRadioGroup' BorderSpacing.Around = 6
Caption = 'ForwardProcsInsertPolicyRadioGroup'
ChildSizing.LeftRightSpacing = 6 ChildSizing.LeftRightSpacing = 6
ChildSizing.TopBottomSpacing = 6 ChildSizing.TopBottomSpacing = 6
ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
@ -25,242 +30,43 @@ inherited CodetoolsCodeCreationOptionsFrame: TCodetoolsCodeCreationOptionsFrame
ChildSizing.ControlsPerLine = 1 ChildSizing.ControlsPerLine = 1
TabOrder = 0 TabOrder = 0
end end
object MethodInsertPolicyRadioGroup: TRadioGroup[1] object ForwardProcsKeepOrderCheckBox: TCheckBox[1]
AnchorSideLeft.Control = ClassPartInsertPolicyRadioGroup
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 260
Height = 100
Width = 312
Anchors = [akTop, akLeft, akRight]
AutoFill = True
BorderSpacing.Left = 6
Caption = 'MethodInsertPolicyRadioGroup'
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 MixMethodsAndPropertiesCheckBox: TCheckBox[2]
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ClassPartInsertPolicyRadioGroup
AnchorSideTop.Side = asrBottom
Height = 19
Top = 106
Width = 198
BorderSpacing.Top = 6
Caption = 'MixMethodsAndPropertiesCheckBox'
TabOrder = 2
end
object ForwardProcsInsertPolicyRadioGroup: TRadioGroup[3]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MixMethodsAndPropertiesCheckBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = ClassPartInsertPolicyRadioGroup
AnchorSideRight.Side = asrBottom
Height = 100
Top = 137
Width = 254
Anchors = [akTop, akLeft, akRight]
AutoFill = True
BorderSpacing.Top = 12
Caption = 'ForwardProcsInsertPolicyRadioGroup'
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 = 3
end
object ForwardProcsKeepOrderCheckBox: TCheckBox[4]
AnchorSideLeft.Control = ForwardProcsInsertPolicyRadioGroup
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ForwardProcsInsertPolicyRadioGroup AnchorSideTop.Control = ForwardProcsInsertPolicyRadioGroup
Left = 260 AnchorSideTop.Side = asrBottom
Height = 19 Left = 6
Top = 143 Height = 22
Width = 191 Top = 112
Width = 239
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'ForwardProcsKeepOrderCheckBox' Caption = 'ForwardProcsKeepOrderCheckBox'
TabOrder = 4 TabOrder = 1
end end
object ClassHeaderCommentsCheckBox: TCheckBox[5] object UsesInsertPolicyRadioGroup: TRadioGroup[2]
AnchorSideLeft.Control = ForwardProcsInsertPolicyRadioGroup
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = ForwardProcsKeepOrderCheckBox
AnchorSideTop.Side = asrBottom
Left = 260
Height = 19
Top = 168
Width = 183
BorderSpacing.Around = 6
Caption = 'ClassHeaderCommentsCheckBox'
TabOrder = 5
end
object PropertyCompletionGroupBox: TGroupBox[6]
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ForwardProcsInsertPolicyRadioGroup AnchorSideTop.Control = ForwardProcsKeepOrderCheckBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Side = asrBottom Left = 6
Height = 123 Height = 100
Top = 243 Top = 146
Width = 572 Width = 556
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
AutoFill = True
AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'PropertyCompletionGroupBox' BorderSpacing.Around = 6
ClientHeight = 105 Caption = 'UsesInsertPolicyRadioGroup'
ClientWidth = 568 ChildSizing.LeftRightSpacing = 6
TabOrder = 6 ChildSizing.TopBottomSpacing = 6
object PropertyReadIdentPrefixLabel: TLabel ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
AnchorSideTop.Control = PropertyReadIdentPrefixEdit ChildSizing.EnlargeVertical = crsHomogenousChildResize
AnchorSideTop.Side = asrCenter ChildSizing.ShrinkHorizontal = crsScaleChilds
AnchorSideRight.Control = PropertyReadIdentPrefixEdit ChildSizing.ShrinkVertical = crsScaleChilds
Left = -13 ChildSizing.Layout = cclLeftToRightThenTopToBottom
Height = 14 ChildSizing.ControlsPerLine = 1
Top = 35 Constraints.MinHeight = 100
Width = 147 TabOrder = 2
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PropertyReadIdentPrefixLabel'
ParentColor = False
end
object PropertyWriteIdentPrefixLabel: TLabel
AnchorSideTop.Control = PropertyWriteIdentPrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyWriteIdentPrefixEdit
Left = -14
Height = 14
Top = 58
Width = 148
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PropertyWriteIdentPrefixLabel'
ParentColor = False
end
object PropertyStoredIdentPostfixLabel: TLabel
AnchorSideTop.Control = PropertyStoredIdentPostfixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyStoredIdentPostfixEdit
Left = -25
Height = 14
Top = 81
Width = 159
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PropertyStoredIdentPostfixLabel'
ParentColor = False
end
object PrivateVariablePrefixLabel: TLabel
AnchorSideTop.Control = PrivateVariablePrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PrivateVariablePrefixEdit
Left = 350
Height = 14
Top = 35
Width = 126
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'PrivateVariablePrefixLabel'
ParentColor = False
end
object SetPropertyVariablenameLabel: TLabel
AnchorSideTop.Control = SetPropertyVariablenameEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = SetPropertyVariablenameEdit
Left = 328
Height = 14
Top = 58
Width = 148
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
Caption = 'SetPropertyVariablenameLabel'
ParentColor = False
end
object PropertyCompletionCheckBox: TCheckBox
AnchorSideLeft.Control = PropertyCompletionGroupBox
AnchorSideTop.Control = PropertyCompletionGroupBox
Left = 6
Height = 19
Top = 6
Width = 168
BorderSpacing.Around = 6
Caption = 'PropertyCompletionCheckBox'
TabOrder = 0
end
object PropertyReadIdentPrefixEdit: TEdit
AnchorSideLeft.Control = PropertyWriteIdentPrefixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = PropertyWriteIdentPrefixEdit
AnchorSideRight.Side = asrBottom
Left = 140
Height = 23
Top = 31
Width = 80
Anchors = [akTop, akLeft, akRight]
TabOrder = 1
Text = 'PropertyReadIdentPrefixEdit'
end
object PropertyWriteIdentPrefixEdit: TEdit
AnchorSideTop.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
Left = 140
Height = 23
Top = 54
Width = 80
TabOrder = 2
Text = 'PropertyWriteIdentPrefixEdit'
end
object PropertyStoredIdentPostfixEdit: TEdit
AnchorSideTop.Control = PropertyWriteIdentPrefixEdit
AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
Left = 140
Height = 23
Top = 77
Width = 80
TabOrder = 3
Text = 'PropertyStoredIdentPostfixEdit'
end
object PrivateVariablePrefixEdit: TEdit
AnchorSideTop.Control = PropertyReadIdentPrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyCompletionGroupBox
AnchorSideRight.Side = asrBottom
Left = 482
Height = 23
Top = 31
Width = 80
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
TabOrder = 4
Text = 'PrivateVariablePrefixEdit'
end
object SetPropertyVariablenameEdit: TEdit
AnchorSideTop.Control = PropertyWriteIdentPrefixEdit
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = PropertyCompletionGroupBox
AnchorSideRight.Side = asrBottom
Left = 482
Height = 23
Top = 54
Width = 80
Anchors = [akTop, akRight]
BorderSpacing.Right = 6
TabOrder = 5
Text = 'SetPropertyVariablenameEdit'
end
end end
end end

142
ide/frames/codetools_codecreation_options.lrs
View File

@ -2,117 +2,35 @@
LazarusResources.Add('TCodetoolsCodeCreationOptionsFrame','FORMDATA',[ LazarusResources.Add('TCodetoolsCodeCreationOptionsFrame','FORMDATA',[
'TPF0'#241'"TCodetoolsCodeCreationOptionsFrame!CodetoolsCodeCreationOptionsFr' 'TPF0'#241'"TCodetoolsCodeCreationOptionsFrame!CodetoolsCodeCreationOptionsFr'
+'ame'#6'Height'#3'y'#1#5'Width'#3'<'#2#12'ClientHeight'#3'y'#1#11'ClientWidt' +'ame'#6'Height'#3'y'#1#5'Width'#3'<'#2#12'ClientHeight'#3'u'#1#11'ClientWidt'
+'h'#3'<'#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#2','#9'DesignTop'#2':' +'h'#3'8'#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'9'#1#9'DesignTop'#3
+#0#242#2#0#11'TRadioGroup'#31'ClassPartInsertPolicyRadioGroup'#22'AnchorSide' +#19#1#0#242#2#0#11'TRadioGroup"ForwardProcsInsertPolicyRadioGroup'#22'Anchor'
+'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#20'AnchorSide' +'SideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'Anchor'
+'Right.Side'#7#9'asrBottom'#6'Height'#2'd'#5'Width'#3#254#0#8'AutoFill'#9#7
+'Caption'#6#31'ClassPartInsertPolicyRadioGroup'#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#242#2#1#11'TRadioGroup'#28'MethodInsertPolicyRadioGroup'
+#22'AnchorSideLeft.Control'#7#31'ClassPartInsertPolicyRadioGroup'#19'AnchorS'
+'ideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'Anchor'
+'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef' +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
+'t'#3#4#1#6'Height'#2'd'#5'Width'#3'8'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7 +'t'#2#6#6'Height'#2'd'#3'Top'#2#6#5'Width'#3','#2#7'Anchors'#11#5'akTop'#6'a'
+'akRight'#0#8'AutoFill'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#28'MethodI' +'kLeft'#7'akRight'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+'nsertPolicyRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.' +'"ForwardProcsInsertPolicyRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28
+'TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousC' +'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'cr'
+'hildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize' +'sHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousC'
+#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shrink' +'hildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildS'
+'Vertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightTh' +'izing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL'
+'enTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#1#0#0#242#2 +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2
+#2#9'TCheckBox'#31'MixMethodsAndPropertiesCheckBox'#22'AnchorSideLeft.Contro' +#0#0#0#242#2#1#9'TCheckBox'#29'ForwardProcsKeepOrderCheckBox'#22'AnchorSideL'
+'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#31'ClassPartInsertPolicyRadioGrou' +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7'"ForwardProcsInsertPoli'
+'p'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2#19#3'Top'#2'j'#5'Width' +'cyRadioGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+#3#198#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#31'MixMethodsAndPropertiesCh' +#22#3'Top'#2'p'#5'Width'#3#239#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#29
+'eckBox'#8'TabOrder'#2#2#0#0#242#2#3#11'TRadioGroup"ForwardProcsInsertPolicy' +'ForwardProcsKeepOrderCheckBox'#8'TabOrder'#2#1#0#0#242#2#2#11'TRadioGroup'
+'RadioGroup'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control' +#26'UsesInsertPolicyRadioGroup'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
+#7#31'MixMethodsAndPropertiesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom' +'horSideTop.Control'#7#29'ForwardProcsKeepOrderCheckBox'#18'AnchorSideTop.Si'
+#23'AnchorSideRight.Control'#7#31'ClassPartInsertPolicyRadioGroup'#20'Anchor' +'de'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRigh'
+'SideRight.Side'#7#9'asrBottom'#6'Height'#2'd'#3'Top'#3#137#0#5'Width'#3#254 +'t.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'd'#3'Top'#3#146#0#5'Width'#3
+#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#17'BorderSpac' +','#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#8'AutoSize'
+'ing.Top'#2#12#7'Caption'#6'"ForwardProcsInsertPolicyRadioGroup'#28'ChildSiz' +#9#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'Us'
+'ing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizi' +'esInsertPolicyRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizi'
+'ng.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enlarge' +'ng.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogeno'
+'Vertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7 +'usChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResiz'
+#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C' +'e'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shr'
+'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr' +'inkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRigh'
+'olsPerLine'#2#1#8'TabOrder'#2#3#0#0#242#2#4#9'TCheckBox'#29'ForwardProcsKee' +'tThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#21'Constraints.MinHei'
+'pOrderCheckBox'#22'AnchorSideLeft.Control'#7'"ForwardProcsInsertPolicyRadio' +'ght'#2'd'#8'TabOrder'#2#2#0#0#0
+'Group'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7'"'
+'ForwardProcsInsertPolicyRadioGroup'#4'Left'#3#4#1#6'Height'#2#19#3'Top'#3
+#143#0#5'Width'#3#191#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#29'Forward'
+'ProcsKeepOrderCheckBox'#8'TabOrder'#2#4#0#0#242#2#5#9'TCheckBox'#27'ClassHe'
+'aderCommentsCheckBox'#22'AnchorSideLeft.Control'#7'"ForwardProcsInsertPolic'
+'yRadioGroup'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+'l'#7#29'ForwardProcsKeepOrderCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+#4'Left'#3#4#1#6'Height'#2#19#3'Top'#3#168#0#5'Width'#3#183#0#20'BorderSpaci'
+'ng.Around'#2#6#7'Caption'#6#27'ClassHeaderCommentsCheckBox'#8'TabOrder'#2#5
+#0#0#242#2#6#9'TGroupBox'#26'PropertyCompletionGroupBox'#22'AnchorSideLeft.C'
+'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7'"ForwardProcsInsertPolicyRad'
+'ioGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7
+#9'asrBottom'#6'Height'#2'{'#3'Top'#3#243#0#5'Width'#3'<'#2#7'Anchors'#11#5
+'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'Pro'
+'pertyCompletionGroupBox'#12'ClientHeight'#2'i'#11'ClientWidth'#3'8'#2#8'Tab'
+'Order'#2#6#0#6'TLabel'#28'PropertyReadIdentPrefixLabel'#21'AnchorSideTop.Co'
+'ntrol'#7#27'PropertyReadIdentPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrCent'
+'er'#23'AnchorSideRight.Control'#7#27'PropertyReadIdentPrefixEdit'#4'Left'#2
+#243#6'Height'#2#14#3'Top'#2'#'#5'Width'#3#147#0#7'Anchors'#11#5'akTop'#7'ak'
+'Right'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#28'PropertyReadIdentPrefi'
+'xLabel'#11'ParentColor'#8#0#0#6'TLabel'#29'PropertyWriteIdentPrefixLabel'#21
,'AnchorSideTop.Control'#7#28'PropertyWriteIdentPrefixEdit'#18'AnchorSideTop.'
+'Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#28'PropertyWriteIdentPre'
+'fixEdit'#4'Left'#2#242#6'Height'#2#14#3'Top'#2':'#5'Width'#3#148#0#7'Anchor'
+'s'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#29'Pro'
+'pertyWriteIdentPrefixLabel'#11'ParentColor'#8#0#0#6'TLabel'#31'PropertyStor'
+'edIdentPostfixLabel'#21'AnchorSideTop.Control'#7#30'PropertyStoredIdentPost'
+'fixEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7
+#30'PropertyStoredIdentPostfixEdit'#4'Left'#2#231#6'Height'#2#14#3'Top'#2'Q'
+#5'Width'#3#159#0#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacing.Right'
+#2#6#7'Caption'#6#31'PropertyStoredIdentPostfixLabel'#11'ParentColor'#8#0#0#6
+'TLabel'#26'PrivateVariablePrefixLabel'#21'AnchorSideTop.Control'#7#25'Priva'
+'teVariablePrefixEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRi'
+'ght.Control'#7#25'PrivateVariablePrefixEdit'#4'Left'#3'^'#1#6'Height'#2#14#3
+'Top'#2'#'#5'Width'#2'~'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpacin'
+'g.Right'#2#6#7'Caption'#6#26'PrivateVariablePrefixLabel'#11'ParentColor'#8#0
+#0#6'TLabel'#28'SetPropertyVariablenameLabel'#21'AnchorSideTop.Control'#7#27
+'SetPropertyVariablenameEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Ancho'
+'rSideRight.Control'#7#27'SetPropertyVariablenameEdit'#4'Left'#3'H'#1#6'Heig'
+'ht'#2#14#3'Top'#2':'#5'Width'#3#148#0#7'Anchors'#11#5'akTop'#7'akRight'#0#19
+'BorderSpacing.Right'#2#6#7'Caption'#6#28'SetPropertyVariablenameLabel'#11'P'
+'arentColor'#8#0#0#9'TCheckBox'#26'PropertyCompletionCheckBox'#22'AnchorSide'
+'Left.Control'#7#26'PropertyCompletionGroupBox'#21'AnchorSideTop.Control'#7
+#26'PropertyCompletionGroupBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Widt'
+'h'#3#168#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'PropertyCompletionC'
+'heckBox'#8'TabOrder'#2#0#0#0#5'TEdit'#27'PropertyReadIdentPrefixEdit'#22'An'
+'chorSideLeft.Control'#7#28'PropertyWriteIdentPrefixEdit'#18'AnchorSideTop.S'
+'ide'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#28'PropertyWriteIdentPref'
+'ixEdit'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#140#0#6'Height'#2
+#23#3'Top'#2#31#5'Width'#2'P'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+'TabOrder'#2#1#4'Text'#6#27'PropertyReadIdentPrefixEdit'#0#0#5'TEdit'#28'Pro'
+'pertyWriteIdentPrefixEdit'#21'AnchorSideTop.Control'#7#27'PropertyReadIdent'
+'PrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7
+#9'asrBottom'#4'Left'#3#140#0#6'Height'#2#23#3'Top'#2'6'#5'Width'#2'P'#8'Tab'
+'Order'#2#2#4'Text'#6#28'PropertyWriteIdentPrefixEdit'#0#0#5'TEdit'#30'Prope'
+'rtyStoredIdentPostfixEdit'#21'AnchorSideTop.Control'#7#28'PropertyWriteIden'
+'tPrefixEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'
+#7#9'asrBottom'#4'Left'#3#140#0#6'Height'#2#23#3'Top'#2'M'#5'Width'#2'P'#8'T'
+'abOrder'#2#3#4'Text'#6#30'PropertyStoredIdentPostfixEdit'#0#0#5'TEdit'#25'P'
+'rivateVariablePrefixEdit'#21'AnchorSideTop.Control'#7#27'PropertyReadIdentP'
+'refixEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'
+#7#26'PropertyCompletionGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+'Left'#3#226#1#6'Height'#2#23#3'Top'#2#31#5'Width'#2'P'#7'Anchors'#11#5'akTo'
+'p'#7'akRight'#0#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#4#4'Text'#6#25'Pr'
+'ivateVariablePrefixEdit'#0#0#5'TEdit'#27'SetPropertyVariablenameEdit'#21'An'
+'chorSideTop.Control'#7#28'PropertyWriteIdentPrefixEdit'#18'AnchorSideTop.Si'
+'de'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#26'PropertyCompletionGroup'
+'Box'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#226#1#6'Height'#2#23
+#3'Top'#2'6'#5'Width'#2'P'#7'Anchors'#11#5'akTop'#7'akRight'#0#19'BorderSpac'
+'ing.Right'#2#6#8'TabOrder'#2#5#4'Text'#6#27'SetPropertyVariablenameEdit'#0#0
+#0#0
]); ]);

144
ide/frames/codetools_codecreation_options.pas
View File

@ -33,26 +33,10 @@ type
{ TCodetoolsCodeCreationOptionsFrame } { TCodetoolsCodeCreationOptionsFrame }
TCodetoolsCodeCreationOptionsFrame = class(TAbstractIDEOptionsEditor) TCodetoolsCodeCreationOptionsFrame = class(TAbstractIDEOptionsEditor)
ClassHeaderCommentsCheckBox: TCheckBox;
ClassPartInsertPolicyRadioGroup: TRadioGroup;
ForwardProcsInsertPolicyRadioGroup: TRadioGroup; ForwardProcsInsertPolicyRadioGroup: TRadioGroup;
ForwardProcsKeepOrderCheckBox: TCheckBox; ForwardProcsKeepOrderCheckBox: TCheckBox;
MethodInsertPolicyRadioGroup: TRadioGroup; UsesInsertPolicyRadioGroup: TRadioGroup;
MixMethodsAndPropertiesCheckBox: TCheckBox;
PrivateVariablePrefixEdit: TEdit;
PrivateVariablePrefixLabel: TLabel;
PropertyCompletionCheckBox: TCheckBox;
PropertyCompletionGroupBox: TGroupBox;
PropertyReadIdentPrefixEdit: TEdit;
PropertyReadIdentPrefixLabel: TLabel;
PropertyStoredIdentPostfixEdit: TEdit;
PropertyStoredIdentPostfixLabel: TLabel;
PropertyWriteIdentPrefixEdit: TEdit;
PropertyWriteIdentPrefixLabel: TLabel;
SetPropertyVariablenameEdit: TEdit;
SetPropertyVariablenameLabel: TLabel;
private private
{ private declarations }
public public
function GetTitle: String; override; function GetTitle: String; override;
procedure Setup(ADialog: TAbstractOptionsEditorDialog); override; procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@ -73,30 +57,6 @@ end;
procedure TCodetoolsCodeCreationOptionsFrame.Setup( procedure TCodetoolsCodeCreationOptionsFrame.Setup(
ADialog: TAbstractOptionsEditorDialog); ADialog: TAbstractOptionsEditorDialog);
begin begin
with ClassPartInsertPolicyRadioGroup do begin
Caption:=dlgClassInsertPolicy;
with Items do begin
BeginUpdate;
Add(dlgAlphabetically);
Add(dlgCDTLast);
EndUpdate;
end;
end;
with MixMethodsAndPropertiesCheckBox do
Caption:=dlgMixMethodsAndProperties;
with MethodInsertPolicyRadioGroup do begin
Caption:=dlgMethodInsPolicy;
with Items do begin
BeginUpdate;
Add(dlgAlphabetically);
Add(dlgCDTLast);
Add(dlgCDTClassOrder);
EndUpdate;
end;
end;
with ForwardProcsInsertPolicyRadioGroup do begin with ForwardProcsInsertPolicyRadioGroup do begin
Caption:=dlgForwardProcsInsertPolicy; Caption:=dlgForwardProcsInsertPolicy;
with Items do begin with Items do begin
@ -111,29 +71,18 @@ begin
with ForwardProcsKeepOrderCheckBox do with ForwardProcsKeepOrderCheckBox do
Caption:=dlgForwardProcsKeepOrder; Caption:=dlgForwardProcsKeepOrder;
with ClassHeaderCommentsCheckBox do with UsesInsertPolicyRadioGroup do begin
Caption:=lisHeaderCommentForClass; Caption:=lisNewUnitsAreAddedToUsesSections;
with Items do begin
with PropertyCompletionGroupBox do BeginUpdate;
Caption:=dlgPropertyCompletion; Add(lisFirst);
Add(lisInFrontOfRelated);
with PropertyCompletionCheckBox do Add(lisBehindRelated);
Caption:=dlgCompleteProperties; Add(dlgCDTLast);
Add(dlgAlphabetically);
with PropertyReadIdentPrefixLabel do EndUpdate;
Caption:=dlgCDTReadPrefix; end;
end;
with PropertyWriteIdentPrefixLabel do
Caption:=dlgCDTWritePrefix;
with PropertyStoredIdentPostfixLabel do
Caption:=dlgCDTStoredPostfix;
with PrivateVariablePrefixLabel do
Caption:=dlgCDTVariablePrefix;
with SetPropertyVariablenameLabel do
Caption:=dlgSetPropertyVariable;
end; end;
procedure TCodetoolsCodeCreationOptionsFrame.ReadSettings( procedure TCodetoolsCodeCreationOptionsFrame.ReadSettings(
@ -141,15 +90,6 @@ procedure TCodetoolsCodeCreationOptionsFrame.ReadSettings(
begin begin
with AOptions as TCodetoolsOptions do with AOptions as TCodetoolsOptions do
begin begin
case ClassPartInsertPolicy of
cpipAlphabetically:
ClassPartInsertPolicyRadioGroup.ItemIndex:=0;
else
// cpipLast
ClassPartInsertPolicyRadioGroup.ItemIndex:=1;
end;
MixMethodsAndPropertiesCheckBox.Checked := MixMethodsAndProperties;
case ForwardProcBodyInsertPolicy of case ForwardProcBodyInsertPolicy of
fpipLast: ForwardProcsInsertPolicyRadioGroup.ItemIndex:=0; fpipLast: ForwardProcsInsertPolicyRadioGroup.ItemIndex:=0;
fpipInFrontOfMethods: ForwardProcsInsertPolicyRadioGroup.ItemIndex:=1; fpipInFrontOfMethods: ForwardProcsInsertPolicyRadioGroup.ItemIndex:=1;
@ -159,23 +99,16 @@ begin
end; end;
ForwardProcsKeepOrderCheckBox.Checked := KeepForwardProcOrder; ForwardProcsKeepOrderCheckBox.Checked := KeepForwardProcOrder;
ClassHeaderCommentsCheckBox.Checked := ClassHeaderComments;
case MethodInsertPolicy of
mipAlphabetically:
MethodInsertPolicyRadioGroup.ItemIndex:=0;
mipLast:
MethodInsertPolicyRadioGroup.ItemIndex:=1;
else
// mipClassOrder
MethodInsertPolicyRadioGroup.ItemIndex:=2;
end;
PropertyCompletionCheckBox.Checked := CompleteProperties; case UsesInsertPolicy of
PropertyReadIdentPrefixEdit.Text := PropertyReadIdentPrefix; uipFirst: UsesInsertPolicyRadioGroup.ItemIndex:=0;
PropertyWriteIdentPrefixEdit.Text := PropertyWriteIdentPrefix; uipInFrontOfRelated: UsesInsertPolicyRadioGroup.ItemIndex:=1;
PropertyStoredIdentPostfixEdit.Text := PropertyStoredIdentPostfix; uipBehindRelated: UsesInsertPolicyRadioGroup.ItemIndex:=2;
PrivateVariablePrefixEdit.Text := PrivateVariablePrefix; uipLast: UsesInsertPolicyRadioGroup.ItemIndex:=3;
SetPropertyVariablenameEdit.Text := SetPropertyVariablename; else
//uipAlphabetically:
UsesInsertPolicyRadioGroup.ItemIndex:=4;
end;
end; end;
end; end;
@ -184,36 +117,21 @@ procedure TCodetoolsCodeCreationOptionsFrame.WriteSettings(
begin begin
with AOptions as TCodetoolsOptions do with AOptions as TCodetoolsOptions do
begin begin
case ClassPartInsertPolicyRadioGroup.ItemIndex of
0: ClassPartInsertPolicy := cpipAlphabetically;
1: ClassPartInsertPolicy := cpipLast;
end;
MixMethodsAndProperties := MixMethodsAndPropertiesCheckBox.Checked;
case ForwardProcsInsertPolicyRadioGroup.ItemIndex of case ForwardProcsInsertPolicyRadioGroup.ItemIndex of
0: ForwardProcBodyInsertPolicy := fpipLast; 0: ForwardProcBodyInsertPolicy := fpipLast;
1: ForwardProcBodyInsertPolicy := fpipInFrontOfMethods; 1: ForwardProcBodyInsertPolicy := fpipInFrontOfMethods;
2: ForwardProcBodyInsertPolicy := fpipBehindMethods; 2: ForwardProcBodyInsertPolicy := fpipBehindMethods;
end; end;
KeepForwardProcOrder := ForwardProcsKeepOrderCheckBox.Checked;
ClassHeaderComments := ClassHeaderCommentsCheckBox.Checked;
case MethodInsertPolicyRadioGroup.ItemIndex of
0: MethodInsertPolicy := mipAlphabetically;
1: MethodInsertPolicy := mipLast;
2: MethodInsertPolicy := mipClassOrder;
end;
CompleteProperties:=PropertyCompletionCheckBox.Checked; KeepForwardProcOrder := ForwardProcsKeepOrderCheckBox.Checked;
PropertyReadIdentPrefix :=
ReadIdentifier(PropertyReadIdentPrefixEdit.Text,'Get'); case UsesInsertPolicyRadioGroup.ItemIndex of
PropertyWriteIdentPrefix := 0: UsesInsertPolicy:=uipFirst;
ReadIdentifier(PropertyWriteIdentPrefixEdit.Text,'Set'); 1: UsesInsertPolicy:=uipInFrontOfRelated;
PropertyStoredIdentPostfix := 2: UsesInsertPolicy:=uipBehindRelated;
ReadIdentifier(PropertyStoredIdentPostfixEdit.Text,'IsStored'); 3: UsesInsertPolicy:=uipLast;
PrivateVariablePrefix := else UsesInsertPolicy:=uipAlphabetically;
ReadIdentifier(PrivateVariablePrefixEdit.Text,'F'); end;
SetPropertyVariablename :=
ReadIdentifier(SetPropertyVariablenameEdit.Text,'AValue');
end; end;
end; end;

5
ide/lazarusidestrconsts.pas
View File

@ -1300,6 +1300,7 @@ resourcestring
dlgCenterCursorLine = 'Center Cursor Line'; dlgCenterCursorLine = 'Center Cursor Line';
dlgCursorBeyondEOL = 'Cursor beyond EOL'; dlgCursorBeyondEOL = 'Cursor beyond EOL';
dlgClassInsertPolicy = 'Class part insert policy'; dlgClassInsertPolicy = 'Class part insert policy';
lisClassCompletion = 'Class Completion';
dlgAlphabetically = 'Alphabetically'; dlgAlphabetically = 'Alphabetically';
dlgCDTLast = 'Last'; dlgCDTLast = 'Last';
dlgMixMethodsAndProperties = 'Mix methods and properties'; dlgMixMethodsAndProperties = 'Mix methods and properties';
@ -1308,6 +1309,10 @@ resourcestring
dlgInFrontOfMethods = 'In front of methods'; dlgInFrontOfMethods = 'In front of methods';
dlgBehindMethods = 'Behind methods'; dlgBehindMethods = 'Behind methods';
dlgForwardProcsKeepOrder = 'Keep order of procedures'; dlgForwardProcsKeepOrder = 'Keep order of procedures';
lisNewUnitsAreAddedToUsesSections = 'New units are added to uses sections:';
lisFirst = 'First';
lisInFrontOfRelated = 'In front of related';
lisBehindRelated = 'Behind related';
dlgMethodInsPolicy = 'Method insert policy'; dlgMethodInsPolicy = 'Method insert policy';
dlgCDTClassOrder = 'Class order'; dlgCDTClassOrder = 'Class order';
dlgKeywordPolicy = 'Keyword policy'; dlgKeywordPolicy = 'Keyword policy';

3
ide/main.pp
View File

@ -123,7 +123,8 @@ uses
editor_color_options, editor_codetools_options, editor_codefolding_options, editor_color_options, editor_codetools_options, editor_codefolding_options,
editor_codefolding_mouse_options, editor_codefolding_mouse_options,
editor_general_misc_options, editor_dividerdraw_options, editor_general_misc_options, editor_dividerdraw_options,
codetools_general_options, codetools_codecreation_options, atom_checkboxes_options, codetools_general_options, codetools_codecreation_options,
codetools_classcompletion_options, atom_checkboxes_options,
codetools_wordpolicy_options, codetools_linesplitting_options, codetools_wordpolicy_options, codetools_linesplitting_options,
codetools_space_options, codetools_identifiercompletion_options, codetools_space_options, codetools_identifiercompletion_options,
debugger_general_options, debugger_eventlog_options, debugger_general_options, debugger_eventlog_options,

11
ideintf/ideoptionsintf.pas
View File

@ -140,11 +140,12 @@ const
GroupCodetools = 300; GroupCodetools = 300;
CdtOptionsGeneral = 100; CdtOptionsGeneral = 100;
CdtOptionsCodeCreation = 200; CdtOptionsClassCompletion = 200;
CdtOptionsWords = 300; CdtOptionsCodeCreation = 300;
CdtOptionsLineSplitting = 400; CdtOptionsWords = 400;
CdtOptionsSpace = 500; CdtOptionsLineSplitting = 500;
CdtOptionsIdentCompletion = 600; CdtOptionsSpace = 600;
CdtOptionsIdentCompletion = 700;
GroupCodeExplorer = 350; GroupCodeExplorer = 350;
cdeOptionsUpdate = 100; cdeOptionsUpdate = 100;