IDE: identifier completion: moved auto start option to codetools options

git-svn-id: trunk@21296 -
This commit is contained in:
mattias 2009-08-18 19:59:28 +00:00
parent 9493a8684c
commit e363193148
9 changed files with 302 additions and 295 deletions

View File

@ -49,7 +49,6 @@ type
private
FClassHeaderComments: boolean;
FFilename: string;
FIdentComplAddAssignOperator: Boolean;
// General
FSrcPath: string;
@ -84,10 +83,12 @@ type
FPropertyStoredIdentPostfix: string;
FPrivateVariablePrefix: string;
FSetPropertyVariablename: string;
FUsesInsertPolicy: TUsesInsertPolicy;
// identifier completion
FIdentComplAddSemicolon: Boolean;
FUsesInsertPolicy: TUsesInsertPolicy;
FIdentComplAddAssignOperator: Boolean;
FIdentComplAutoStartAfterPoint: boolean;
procedure SetFilename(const AValue: string);
public
@ -174,6 +175,8 @@ type
write FIdentComplAddSemicolon;
property IdentComplAddAssignOperator: Boolean read FIdentComplAddAssignOperator
write FIdentComplAddAssignOperator;
property IdentComplAutoStartAfterPoint: boolean read FIdentComplAutoStartAfterPoint
write FIdentComplAutoStartAfterPoint;
end;
var
@ -389,6 +392,8 @@ begin
'CodeToolsOptions/IdentifierCompletion/AddSemicolon',true);
FIdentComplAddAssignOperator:=XMLConfig.GetValue(
'CodeToolsOptions/IdentifierCompletion/AddAssignOperator',true);
FIdentComplAutoStartAfterPoint:=XMLConfig.GetValue(
'CodeToolsOptions/IdentifierCompletion/AutoStartAfterPoint',true);
XMLConfig.Free;
except
@ -493,6 +498,8 @@ begin
FIdentComplAddSemicolon,true);
XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/AddAssignOperator',
FIdentComplAddAssignOperator,true);
XMLConfig.SetDeleteValue('CodeToolsOptions/IdentifierCompletion/AutoStartAfterPoint',
FIdentComplAutoStartAfterPoint,true);
XMLConfig.Flush;
XMLConfig.Free;
@ -576,6 +583,7 @@ begin
// identifier completion
FIdentComplAddSemicolon:=CodeToolsOpts.FIdentComplAddSemicolon;
FIdentComplAddAssignOperator:=CodeToolsOpts.FIdentComplAddAssignOperator;
FIdentComplAutoStartAfterPoint:=CodeToolsOpts.FIdentComplAutoStartAfterPoint;
end
else
Clear;
@ -622,6 +630,7 @@ begin
// identifier completion
FIdentComplAddSemicolon:=true;
FIdentComplAddAssignOperator:=true;
FIdentComplAutoStartAfterPoint:=true;
end;
procedure TCodeToolsOptions.ClearGlobalDefineTemplates;
@ -672,6 +681,11 @@ begin
and (FPrivateVariablePrefix=CodeToolsOpts.FPrivateVariablePrefix)
and (FSetPropertyVariablename=CodeToolsOpts.FSetPropertyVariablename)
and (FUsesInsertPolicy=CodeToolsOpts.FUsesInsertPolicy)
// identifier completion
and (FIdentComplAddSemicolon=CodeToolsOpts.FIdentComplAddSemicolon)
and (FIdentComplAddAssignOperator=CodeToolsOpts.FIdentComplAddAssignOperator)
and (FIdentComplAutoStartAfterPoint=CodeToolsOpts.FIdentComplAutoStartAfterPoint)
;
end;

View File

@ -821,7 +821,6 @@ type
fAutoBlockCompletion: Boolean;
fAutoCodeParameters: Boolean;
fAutoDelayInMSec: Integer;
fAutoIdentifierCompletion: Boolean;
FAutoRemoveEmptyMethods: Boolean;
fAutoToolTipExprEval: Boolean;
fAutoToolTipSymbTools: Boolean;
@ -976,8 +975,6 @@ type
read FMarkupCurWordNoTimer write FMarkupCurWordNoTimer default False;
// Code Tools options
property AutoIdentifierCompletion: Boolean
read fAutoIdentifierCompletion write fAutoIdentifierCompletion default True;
property AutoBlockCompletion: Boolean
read fAutoBlockCompletion write FAutoBlockCompletion default True;
property AutoCodeParameters: Boolean
@ -2628,9 +2625,6 @@ begin
'EditorOptions/Display/MarkupCurrentWord/NoTimer', False);
// Code Tools options
fAutoIdentifierCompletion :=
XMLConfig.GetValue(
'EditorOptions/CodeTools/AutoIdentifierCompletion', True);
fAutoBlockCompletion :=
XMLConfig.GetValue(
'EditorOptions/CodeTools/AutoBlockCompletion', True);
@ -2851,8 +2845,6 @@ begin
FMarkupCurWordNoTimer, False);
// Code Tools options
XMLConfig.SetDeleteValue('EditorOptions/CodeTools/AutoIdentifierCompletion'
, fAutoIdentifierCompletion, True);
XMLConfig.SetDeleteValue('EditorOptions/CodeTools/AutoBlockCompletion'
, fAutoBlockCompletion, True);
XMLConfig.SetDeleteValue('EditorOptions/CodeTools/AutoCodeParameters'

View File

@ -1,29 +1,44 @@
object CodetoolsIndentifierComplietionOptionsFrame: TCodetoolsIndentifierComplietionOptionsFrame
inherited CodetoolsIndentifierComplietionOptionsFrame: TCodetoolsIndentifierComplietionOptionsFrame
Height = 300
Width = 400
ClientHeight = 300
ClientWidth = 400
TabOrder = 0
Visible = False
DesignLeft = 991
DesignTop = 321
object ICAddSemicolonCheckBox: TCheckBox
DesignLeft = 651
DesignTop = 262
object ICAddSemicolonCheckBox: TCheckBox[0]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
Height = 19
Width = 150
Left = 0
Height = 22
Top = 0
Width = 191
Caption = 'ICAddSemicolonCheckBox'
TabOrder = 0
end
object ICAddAssignOperatorCheckBox: TCheckBox
object ICAddAssignOperatorCheckBox: TCheckBox[1]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ICAddSemicolonCheckBox
AnchorSideTop.Side = asrBottom
Height = 19
Top = 25
Width = 178
Left = 0
Height = 22
Top = 28
Width = 223
BorderSpacing.Top = 6
Caption = 'ICAddAssignOperatorCheckBox'
TabOrder = 1
end
object ICAutoStartAfterPointCheckBox: TCheckBox[2]
AnchorSideLeft.Control = ICAddSemicolonCheckBox
AnchorSideTop.Control = ICAddAssignOperatorCheckBox
AnchorSideTop.Side = asrBottom
Left = 0
Height = 22
Top = 56
Width = 224
BorderSpacing.Top = 6
Caption = 'ICAutoStartAfterPointCheckBox'
TabOrder = 2
end
end

View File

@ -1,15 +1,20 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TCodetoolsIndentifierComplietionOptionsFrame','FORMDATA',[
'TPF0,TCodetoolsIndentifierComplietionOptionsFrame+CodetoolsIndentifierCompli'
+'etionOptionsFrame'#6'Height'#3','#1#5'Width'#3#144#1#12'ClientHeight'#3','#1
+#11'ClientWidth'#3#144#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#223#3
+#9'DesignTop'#3'A'#1#0#9'TCheckBox'#22'ICAddSemicolonCheckBox'#22'AnchorSide'
+'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#6'Height'#2#19
+#5'Width'#3#150#0#7'Caption'#6#22'ICAddSemicolonCheckBox'#8'TabOrder'#2#0#0#0
+#9'TCheckBox'#27'ICAddAssignOperatorCheckBox'#22'AnchorSideLeft.Control'#7#5
+'Owner'#21'AnchorSideTop.Control'#7#22'ICAddSemicolonCheckBox'#18'AnchorSide'
+'Top.Side'#7#9'asrBottom'#6'Height'#2#19#3'Top'#2#25#5'Width'#3#178#0#17'Bor'
+'derSpacing.Top'#2#6#7'Caption'#6#27'ICAddAssignOperatorCheckBox'#8'TabOrder'
+#2#1#0#0#0
'TPF0'#241',TCodetoolsIndentifierComplietionOptionsFrame+CodetoolsIndentifier'
+'ComplietionOptionsFrame'#6'Height'#3','#1#5'Width'#3#144#1#12'ClientHeight'
+#3','#1#11'ClientWidth'#3#144#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3
+#139#2#9'DesignTop'#3#6#1#0#242#2#0#9'TCheckBox'#22'ICAddSemicolonCheckBox'
+#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4
+'Left'#2#0#6'Height'#2#22#3'Top'#2#0#5'Width'#3#191#0#7'Caption'#6#22'ICAddS'
+'emicolonCheckBox'#8'TabOrder'#2#0#0#0#242#2#1#9'TCheckBox'#27'ICAddAssignOp'
+'eratorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Cont'
+'rol'#7#22'ICAddSemicolonCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+'eft'#2#0#6'Height'#2#22#3'Top'#2#28#5'Width'#3#223#0#17'BorderSpacing.Top'#2
+#6#7'Caption'#6#27'ICAddAssignOperatorCheckBox'#8'TabOrder'#2#1#0#0#242#2#2#9
+'TCheckBox'#29'ICAutoStartAfterPointCheckBox'#22'AnchorSideLeft.Control'#7#22
+'ICAddSemicolonCheckBox'#21'AnchorSideTop.Control'#7#27'ICAddAssignOperatorC'
+'heckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#22#3
+'Top'#2'8'#5'Width'#3#224#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#29'ICAuto'
+'StartAfterPointCheckBox'#8'TabOrder'#2#2#0#0#0
]);

View File

@ -33,6 +33,7 @@ type
{ TCodetoolsIndentifierComplietionOptionsFrame }
TCodetoolsIndentifierComplietionOptionsFrame = class(TAbstractIDEOptionsEditor)
ICAutoStartAfterPointCheckBox: TCheckBox;
ICAddAssignOperatorCheckBox: TCheckBox;
ICAddSemicolonCheckBox: TCheckBox;
private
@ -57,10 +58,9 @@ end;
procedure TCodetoolsIndentifierComplietionOptionsFrame.Setup(
ADialog: TAbstractOptionsEditorDialog);
begin
with ICAddSemicolonCheckBox do
Caption:=dlgAddSemicolon;
with ICAddAssignOperatorCheckBox do
Caption:=dlgAddAssignmentOperator;
ICAddSemicolonCheckBox.Caption:=dlgAddSemicolon;
ICAddAssignOperatorCheckBox.Caption:=dlgAddAssignmentOperator;
ICAutoStartAfterPointCheckBox.Caption:=dlgEdIdComlet;
end;
procedure TCodetoolsIndentifierComplietionOptionsFrame.ReadSettings(
@ -70,6 +70,7 @@ begin
begin
ICAddSemicolonCheckBox.Checked := IdentComplAddSemicolon;
ICAddAssignOperatorCheckBox.Checked := IdentComplAddAssignOperator;
ICAutoStartAfterPointCheckBox.Checked := IdentComplAutoStartAfterPoint;
end;
end;
@ -80,6 +81,7 @@ begin
begin
IdentComplAddSemicolon := ICAddSemicolonCheckBox.Checked;
IdentComplAddAssignOperator := ICAddAssignOperatorCheckBox.Checked;
IdentComplAutoStartAfterPoint := ICAutoStartAfterPointCheckBox.Checked;
end;
end;

View File

@ -12,10 +12,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 399
Left = 404
Height = 18
Top = 192
Width = 132
Top = 170
Width = 127
Alignment = taRightJustify
Anchors = [akTop, akRight]
BorderSpacing.Top = 2
@ -29,8 +29,8 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 18
Top = 192
Width = 128
Top = 170
Width = 123
BorderSpacing.Left = 6
BorderSpacing.Top = 2
Caption = 'AutoDelayMinLabel'
@ -41,10 +41,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = AutoDelayMinLabel
AnchorSideTop.Side = asrCenter
Left = 140
Left = 135
Height = 18
Top = 192
Width = 104
Top = 170
Width = 101
BorderSpacing.Left = 6
BorderSpacing.Top = 24
Caption = 'AutoDelayLabel'
@ -56,8 +56,8 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 18
Top = 395
Width = 180
Top = 373
Width = 171
BorderSpacing.Left = 6
BorderSpacing.Top = 2
Caption = 'MarkupWordDelayMinLabel'
@ -68,10 +68,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 347
Left = 356
Height = 18
Top = 395
Width = 184
Top = 373
Width = 175
Alignment = taRightJustify
Anchors = [akTop, akRight]
BorderSpacing.Top = 2
@ -84,10 +84,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MarkupWordMinLabel
AnchorSideTop.Side = asrCenter
Left = 192
Left = 183
Height = 18
Top = 395
Width = 156
Top = 373
Width = 149
BorderSpacing.Left = 6
BorderSpacing.Top = 24
Caption = 'MarkupWordDelayLabel'
@ -100,8 +100,8 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideRight.Control = MarkupWordFullLenSpin
Left = 6
Height = 18
Top = 296
Width = 164
Top = 274
Width = 156
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'MarkupWordFullLenLabel'
@ -115,7 +115,7 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideRight.Side = asrBottom
Left = 0
Height = 4
Top = 223
Top = 201
Width = 60
BorderSpacing.Top = 6
BorderSpacing.Bottom = 6
@ -128,7 +128,7 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideRight.Side = asrBottom
Left = 0
Height = 4
Top = 112
Top = 90
Width = 537
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
@ -141,8 +141,8 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 66
Height = 18
Top = 216
Width = 187
Top = 194
Width = 181
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'MarkupWordGroupLabel'
@ -157,10 +157,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 259
Left = 253
Height = 4
Top = 223
Width = 278
Top = 201
Width = 284
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
@ -174,7 +174,7 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideRight.Side = asrBottom
Left = 0
Height = 4
Top = 419
Top = 397
Width = 537
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
@ -187,8 +187,8 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideTop.Side = asrCenter
Left = 162
Height = 18
Top = 435
Width = 86
Top = 413
Width = 84
BorderSpacing.Around = 6
Caption = 'BracketLabel'
ParentColor = False
@ -198,10 +198,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = BracketLabel
AnchorSideTop.Side = asrCenter
Left = 254
Left = 252
Height = 18
Top = 435
Width = 78
Top = 413
Width = 75
BorderSpacing.Around = 6
Caption = 'BracketLink'
Font.Color = clBlue
@ -216,10 +216,10 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MarkupWordNoTimerCheckBox
AnchorSideTop.Side = asrCenter
Left = 239
Left = 231
Height = 18
Top = 242
Width = 78
Top = 220
Width = 75
BorderSpacing.Left = 6
Caption = 'BracketLink'
Font.Color = clBlue
@ -229,70 +229,58 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
OnMouseEnter = BracketLinkMouseEnter
OnMouseLeave = BracketLinkMouseLeave
end
object AutoIdentifierCompletionCheckBox: TCheckBox[15]
object AutoRemoveEmptyMethodsOnSave: TCheckBox[15]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner
Left = 6
Height = 22
Top = 0
Width = 252
BorderSpacing.Left = 6
Caption = 'AutoIdentifierCompletionCheckBox'
TabOrder = 0
end
object AutoRemoveEmptyMethodsOnSave: TCheckBox[16]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = AutoIdentifierCompletionCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 28
Width = 255
Top = 6
Width = 251
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'AutoRemoveEmptyMethodsOnSave'
TabOrder = 1
TabOrder = 0
end
object AutoToolTipSymbToolsCheckBox: TCheckBox[17]
object AutoToolTipSymbToolsCheckBox: TCheckBox[16]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = AutoRemoveEmptyMethodsOnSave
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 56
Width = 235
Top = 34
Width = 227
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'AutoToolTipSymbToolsCheckBox'
TabOrder = 2
TabOrder = 1
end
object AutoCompleteBlockCheckBox: TCheckBox[18]
object AutoCompleteBlockCheckBox: TCheckBox[17]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = AutoToolTipSymbToolsCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 84
Width = 218
Top = 62
Width = 213
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'AutoCompleteBlockCheckBox'
TabOrder = 3
TabOrder = 2
end
object AutoToolTipExprEvalCheckBox: TCheckBox[19]
object AutoToolTipExprEvalCheckBox: TCheckBox[18]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ToolTipBevel
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 122
Width = 222
Top = 100
Width = 213
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'AutoToolTipExprEvalCheckBox'
TabOrder = 4
TabOrder = 3
end
object AutoDelayTrackBar: TTrackBar[20]
object AutoDelayTrackBar: TTrackBar[19]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = AutoToolTipExprEvalCheckBox
AnchorSideTop.Side = asrBottom
@ -300,7 +288,27 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideRight.Side = asrBottom
Left = 6
Height = 40
Top = 150
Top = 128
Width = 525
Frequency = 250
Max = 4000
Min = 500
Position = 500
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
TabOrder = 4
end
object MarkupWordTimeTrackBar: TTrackBar[20]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupWordTrim
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 40
Top = 331
Width = 525
Frequency = 250
Max = 4000
@ -312,93 +320,73 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
BorderSpacing.Right = 6
TabOrder = 5
end
object MarkupWordTimeTrackBar: TTrackBar[21]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupWordTrim
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 6
Height = 40
Top = 353
Width = 525
Frequency = 250
Max = 4000
Min = 500
Position = 500
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
TabOrder = 6
end
object MarkupWordFullCheckBox: TCheckBox[22]
object MarkupWordFullCheckBox: TCheckBox[21]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupWordNoTimerCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 268
Width = 194
Top = 246
Width = 185
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'MarkupWordFullCheckBox'
TabOrder = 7
TabOrder = 6
end
object MarkupWordNoKeyword: TCheckBox[23]
object MarkupWordNoKeyword: TCheckBox[22]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupWordTrim
AnchorSideTop.Side = asrCenter
Left = 6
Height = 22
Top = 325
Width = 180
Top = 303
Width = 172
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'MarkupWordNoKeyword'
TabOrder = 8
TabOrder = 7
end
object MarkupWordFullLenSpin: TSpinEdit[24]
object MarkupWordFullLenSpin: TSpinEdit[23]
AnchorSideLeft.Control = MarkupWordFullLenLabel
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MarkupWordFullLenLabel
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 176
Left = 168
Height = 27
Top = 292
Top = 270
Width = 48
BorderSpacing.Left = 6
TabOrder = 9
TabOrder = 8
end
object MarkupWordNoTimerCheckBox: TCheckBox[25]
object MarkupWordNoTimerCheckBox: TCheckBox[24]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupWordGroupLabel
AnchorSideTop.Side = asrBottom
Left = 6
Height = 22
Top = 240
Width = 227
Top = 218
Width = 219
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'MarkupWordNoTimerCheckBox'
TabOrder = 10
TabOrder = 9
end
object MarkupWordTrim: TCheckBox[26]
object MarkupWordTrim: TCheckBox[25]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupWordFullLenSpin
AnchorSideTop.Side = asrBottom
Left = 230
Height = 22
Top = 325
Width = 134
Top = 303
Width = 128
BorderSpacing.Left = 230
BorderSpacing.Top = 6
Caption = 'MarkupWordTrim'
TabOrder = 11
TabOrder = 10
end
object BracketCombo: TComboBox[27]
object BracketCombo: TComboBox[26]
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = MarkupBevel
AnchorSideTop.Side = asrBottom
@ -406,7 +394,7 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
AnchorSideBottom.Side = asrBottom
Left = 6
Height = 31
Top = 429
Top = 407
Width = 150
BorderSpacing.Left = 6
BorderSpacing.Top = 6
@ -415,6 +403,6 @@ inherited EditorCodetoolsOptionsFrame: TEditorCodetoolsOptionsFrame
OnExit = BracketComboExit
OnKeyDown = BracketComboKeyDown
Style = csDropDownList
TabOrder = 12
TabOrder = 11
end
end

View File

@ -6,154 +6,149 @@ LazarusResources.Add('TEditorCodetoolsOptionsFrame','FORMDATA',[
+#25#2#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'\'#1#9'DesignTop'#3#245#0
+#0#242#2#0#6'TLabel'#17'AutoDelayMaxLabel'#21'AnchorSideTop.Control'#7#17'Au'
+'toDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.C'
+'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#143#1#6
+'Height'#2#18#3'Top'#3#192#0#5'Width'#3#132#0#9'Alignment'#7#14'taRightJusti'
+'fy'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#19'Border'
+'Spacing.Right'#2#6#7'Caption'#6#17'AutoDelayMaxLabel'#11'ParentColor'#8#0#0
+#242#2#1#6'TLabel'#17'AutoDelayMinLabel'#22'AnchorSideLeft.Control'#7#5'Owne'
+'r'#21'AnchorSideTop.Control'#7#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'
+#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#18#3'Top'#3#192#0#5'Width'#3#128#0#18
+'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelay'
+'MinLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#14'AutoDelayLabel'#22'Anc'
+'horSideLeft.Control'#7#17'AutoDelayMinLabel'#19'AnchorSideLeft.Side'#7#9'as'
+'rBottom'#21'AnchorSideTop.Control'#7#17'AutoDelayMinLabel'#18'AnchorSideTop'
+'.Side'#7#9'asrCenter'#4'Left'#3#140#0#6'Height'#2#18#3'Top'#3#192#0#5'Width'
+#2'h'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#24#7'Caption'#6#14
+'AutoDelayLabel'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#18'MarkupWordMinLab'
+'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#148#1#6
+'Height'#2#18#3'Top'#3#170#0#5'Width'#2#127#9'Alignment'#7#14'taRightJustify'
+#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#19'BorderSpac'
+'ing.Right'#2#6#7'Caption'#6#17'AutoDelayMaxLabel'#11'ParentColor'#8#0#0#242
+#2#1#6'TLabel'#17'AutoDelayMinLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+'AnchorSideTop.Control'#7#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'a'
+'srBottom'#4'Left'#2#6#6'Height'#2#18#3'Top'#3#170#0#5'Width'#2'{'#18'Border'
+'Spacing.Left'#2#6#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelayMinLab'
+'el'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#14'AutoDelayLabel'#22'AnchorSid'
+'eLeft.Control'#7#17'AutoDelayMinLabel'#19'AnchorSideLeft.Side'#7#9'asrBotto'
+'m'#21'AnchorSideTop.Control'#7#17'AutoDelayMinLabel'#18'AnchorSideTop.Side'
+#7#9'asrCenter'#4'Left'#3#135#0#6'Height'#2#18#3'Top'#3#170#0#5'Width'#2'e'
+#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#24#7'Caption'#6#14'AutoD'
+'elayLabel'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#18'MarkupWordMinLabel'#22
+'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#22'MarkupWor'
+'dTimeTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+#18#3'Top'#3'u'#1#5'Width'#3#171#0#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
+'ng.Top'#2#2#7'Caption'#6#23'MarkupWordDelayMinLabel'#11'ParentColor'#8#0#0
+#242#2#4#6'TLabel'#18'MarkupWordMaxLabel'#21'AnchorSideTop.Control'#7#22'Mar'
+'kupWordTimeTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRig'
+'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'd'
+#1#6'Height'#2#18#3'Top'#3'u'#1#5'Width'#3#175#0#9'Alignment'#7#14'taRightJu'
+'stify'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#19'Bor'
+'derSpacing.Right'#2#6#7'Caption'#6#23'MarkupWordDelayMaxLabel'#11'ParentCol'
+'or'#8#0#0#242#2#5#6'TLabel'#20'MarkupWordDelayLabel'#22'AnchorSideLeft.Cont'
+'rol'#7#18'MarkupWordMinLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anc'
+'horSideTop.Control'#7#18'MarkupWordMinLabel'#18'AnchorSideTop.Side'#7#9'asr'
+'Center'#4'Left'#3#183#0#6'Height'#2#18#3'Top'#3'u'#1#5'Width'#3#149#0#18'Bo'
+'rderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#24#7'Caption'#6#20'MarkupWord'
+'DelayLabel'#11'ParentColor'#8#0#0#242#2#6#6'TLabel'#22'MarkupWordFullLenLab'
+'el'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#22'Ma'
+'rkupWordTimeTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
+'eight'#2#18#3'Top'#3#139#1#5'Width'#3#180#0#18'BorderSpacing.Left'#2#6#17'B'
+'orderSpacing.Top'#2#2#7'Caption'#6#23'MarkupWordDelayMinLabel'#11'ParentCol'
+'or'#8#0#0#242#2#4#6'TLabel'#18'MarkupWordMaxLabel'#21'AnchorSideTop.Control'
+#7#22'MarkupWordTimeTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Ancho'
+'rkupWordFullCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRi'
+'ght.Control'#7#21'MarkupWordFullLenSpin'#4'Left'#2#6#6'Height'#2#18#3'Top'#3
+#18#1#5'Width'#3#156#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7
+'Caption'#6#22'MarkupWordFullLenLabel'#11'ParentColor'#8#0#0#242#2#7#6'TBeve'
+'l'#15'MarkupWordBevel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideT'
+'op.Control'#7#20'MarkupWordGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'
+#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
+'om'#4'Left'#2#0#6'Height'#2#4#3'Top'#3#201#0#5'Width'#2'<'#17'BorderSpacing'
+'.Top'#2#6#20'BorderSpacing.Bottom'#2#6#0#0#242#2#8#6'TBevel'#12'ToolTipBeve'
+'l'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#25'Aut'
+'oCompleteBlockCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+#0#6'Height'#2#4#3'Top'#2'Z'#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'
+#7'akRight'#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#0#0#242
+#2#9#6'TLabel'#20'MarkupWordGroupLabel'#22'AnchorSideLeft.Control'#7#15'Mark'
+'upWordBevel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+'l'#7#14'AutoDelayLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'B'#6
+'Height'#2#18#3'Top'#3#194#0#5'Width'#3#181#0#18'BorderSpacing.Left'#2#6#17
+'BorderSpacing.Top'#2#6#7'Caption'#6#20'MarkupWordGroupLabel'#10'Font.Style'
+#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#10#6'TBevel'#16
+'MarkupWordBevel1'#22'AnchorSideLeft.Control'#7#20'MarkupWordGroupLabel'#19
+'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#20'MarkupWo'
+'rdGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Cont'
+'rol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#253#0#6'H'
+'eight'#2#4#3'Top'#3#201#0#5'Width'#3#28#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSp'
+'acing.Bottom'#2#6#0#0#242#2#11#6'TBevel'#11'MarkupBevel'#22'AnchorSideLeft.'
+'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#20'MarkupWordDelayLabel'#18
,'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#4#3'Top'#3#141
+#1#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSp'
+'acing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#0#0#242#2#12#6'TLabel'#12'Brack'
+'etLabel'#22'AnchorSideLeft.Control'#7#12'BracketCombo'#19'AnchorSideLeft.Si'
+'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#12'BracketCombo'#18'AnchorSi'
+'deTop.Side'#7#9'asrCenter'#4'Left'#3#162#0#6'Height'#2#18#3'Top'#3#157#1#5
+'Width'#2'T'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'BracketLabel'#11'P'
+'arentColor'#8#0#0#242#2#13#6'TLabel'#11'BracketLink'#22'AnchorSideLeft.Cont'
+'rol'#7#12'BracketLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+'eTop.Control'#7#12'BracketLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Le'
+'ft'#3#252#0#6'Height'#2#18#3'Top'#3#157#1#5'Width'#2'K'#20'BorderSpacing.Ar'
+'ound'#2#6#7'Caption'#6#11'BracketLink'#10'Font.Color'#7#6'clBlue'#11'Parent'
+'Color'#8#10'ParentFont'#8#7'OnClick'#7#16'BracketLinkClick'#12'OnMouseEnter'
+#7#21'BracketLinkMouseEnter'#12'OnMouseLeave'#7#21'BracketLinkMouseLeave'#0#0
+#242#2#14#6'TLabel'#15'MarkupColorLink'#22'AnchorSideLeft.Control'#7#25'Mark'
+'upWordNoTimerCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide'
+'Top.Control'#7#25'MarkupWordNoTimerCheckBox'#18'AnchorSideTop.Side'#7#9'asr'
+'Center'#4'Left'#3#231#0#6'Height'#2#18#3'Top'#3#220#0#5'Width'#2'K'#18'Bord'
+'erSpacing.Left'#2#6#7'Caption'#6#11'BracketLink'#10'Font.Color'#7#6'clBlue'
+#11'ParentColor'#8#10'ParentFont'#8#7'OnClick'#7#20'MarkupColorLinkClick'#12
+'OnMouseEnter'#7#21'BracketLinkMouseEnter'#12'OnMouseLeave'#7#21'BracketLink'
+'MouseLeave'#0#0#242#2#15#9'TCheckBox'#28'AutoRemoveEmptyMethodsOnSave'#22'A'
+'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Le'
+'ft'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#251#0#18'BorderSpacing.Left'#2
+#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#28'AutoRemoveEmptyMethodsOnSave'#8
+'TabOrder'#2#0#0#0#242#2#16#9'TCheckBox'#28'AutoToolTipSymbToolsCheckBox'#22
+'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28'AutoRemov'
+'eEmptyMethodsOnSave'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
+'ight'#2#22#3'Top'#2'"'#5'Width'#3#227#0#18'BorderSpacing.Left'#2#6#17'Borde'
+'rSpacing.Top'#2#6#7'Caption'#6#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'
+#2#1#0#0#242#2#17#9'TCheckBox'#25'AutoCompleteBlockCheckBox'#22'AnchorSideLe'
+'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28'AutoToolTipSymbToolsC'
+'heckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3
+'Top'#2'>'#5'Width'#3#213#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'
+#2#6#7'Caption'#6#25'AutoCompleteBlockCheckBox'#8'TabOrder'#2#2#0#0#242#2#18
+#9'TCheckBox'#27'AutoToolTipExprEvalCheckBox'#22'AnchorSideLeft.Control'#7#5
+'Owner'#21'AnchorSideTop.Control'#7#12'ToolTipBevel'#18'AnchorSideTop.Side'#7
+#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'd'#5'Width'#3#213#0#18'Bor'
+'derSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#27'AutoToolTipE'
+'xprEvalCheckBox'#8'TabOrder'#2#3#0#0#242#2#19#9'TTrackBar'#17'AutoDelayTrac'
+'kBar'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27
+'AutoToolTipExprEvalCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Ancho'
+'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
+'ft'#3'['#1#6'Height'#2#18#3'Top'#3#139#1#5'Width'#3#184#0#9'Alignment'#7#14
+'taRightJustify'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2
+#2#19'BorderSpacing.Right'#2#6#7'Caption'#6#23'MarkupWordDelayMaxLabel'#11'P'
+'arentColor'#8#0#0#242#2#5#6'TLabel'#20'MarkupWordDelayLabel'#22'AnchorSideL'
+'eft.Control'#7#18'MarkupWordMinLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+#21'AnchorSideTop.Control'#7#18'MarkupWordMinLabel'#18'AnchorSideTop.Side'#7
+#9'asrCenter'#4'Left'#3#192#0#6'Height'#2#18#3'Top'#3#139#1#5'Width'#3#156#0
+#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#24#7'Caption'#6#20'Marku'
+'pWordDelayLabel'#11'ParentColor'#8#0#0#242#2#6#6'TLabel'#22'MarkupWordFullL'
+'enLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+#22'MarkupWordFullCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorS'
+'ideRight.Control'#7#21'MarkupWordFullLenSpin'#4'Left'#2#6#6'Height'#2#18#3
+'Top'#3'('#1#5'Width'#3#164#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.To'
+'p'#2#6#7'Caption'#6#22'MarkupWordFullLenLabel'#11'ParentColor'#8#0#0#242#2#7
+#6'TBevel'#15'MarkupWordBevel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
+'orSideTop.Control'#7#20'MarkupWordGroupLabel'#18'AnchorSideTop.Side'#7#9'as'
+'rCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+'asrBottom'#4'Left'#2#0#6'Height'#2#4#3'Top'#3#223#0#5'Width'#2'<'#17'Border'
+'Spacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#0#0#242#2#8#6'TBevel'#12'Tool'
+'TipBevel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+#25'AutoCompleteBlockCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
+'orSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+'eft'#2#0#6'Height'#2#4#3'Top'#2'p'#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6
+'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6
+#0#0#242#2#9#6'TLabel'#20'MarkupWordGroupLabel'#22'AnchorSideLeft.Control'#7
+#15'MarkupWordBevel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop'
+'.Control'#7#14'AutoDelayLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+#2'B'#6'Height'#2#18#3'Top'#3#216#0#5'Width'#3#187#0#18'BorderSpacing.Left'#2
+#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#20'MarkupWordGroupLabel'#10'Font.S'
+'tyle'#11#6'fsBold'#0#11'ParentColor'#8#10'ParentFont'#8#0#0#242#2#10#6'TBev'
+'el'#16'MarkupWordBevel1'#22'AnchorSideLeft.Control'#7#20'MarkupWordGroupLab'
+'el'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#20'M'
+'arkupWordGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRig'
+'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#3#1
+#6'Height'#2#4#3'Top'#3#223#0#5'Width'#3#22#1#7'Anchors'#11#5'akTop'#6'akLef'
+'t'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'Bor'
+'derSpacing.Bottom'#2#6#0#0#242#2#11#6'TBevel'#11'MarkupBevel'#22'AnchorSide'
+'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#20'MarkupWordDelayLabe'
,'l'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Ow'
+'ner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#4#3'To'
+'p'#3#163#1#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17
+'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#0#0#242#2#12#6'TLabel'
+#12'BracketLabel'#22'AnchorSideLeft.Control'#7#12'BracketCombo'#19'AnchorSid'
+'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#12'BracketCombo'#18
+'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#162#0#6'Height'#2#18#3'Top'#3
+#179#1#5'Width'#2'V'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'BracketLab'
+'el'#11'ParentColor'#8#0#0#242#2#13#6'TLabel'#11'BracketLink'#22'AnchorSideL'
+'eft.Control'#7#12'BracketLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'A'
+'nchorSideTop.Control'#7#12'BracketLabel'#18'AnchorSideTop.Side'#7#9'asrCent'
+'er'#4'Left'#3#254#0#6'Height'#2#18#3'Top'#3#179#1#5'Width'#2'N'#20'BorderSp'
+'acing.Around'#2#6#7'Caption'#6#11'BracketLink'#10'Font.Color'#7#6'clBlue'#11
+'ParentColor'#8#10'ParentFont'#8#7'OnClick'#7#16'BracketLinkClick'#12'OnMous'
+'eEnter'#7#21'BracketLinkMouseEnter'#12'OnMouseLeave'#7#21'BracketLinkMouseL'
+'eave'#0#0#242#2#14#6'TLabel'#15'MarkupColorLink'#22'AnchorSideLeft.Control'
+#7#25'MarkupWordNoTimerCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'A'
+'nchorSideTop.Control'#7#25'MarkupWordNoTimerCheckBox'#18'AnchorSideTop.Side'
+#7#9'asrCenter'#4'Left'#3#239#0#6'Height'#2#18#3'Top'#3#242#0#5'Width'#2'N'
+#18'BorderSpacing.Left'#2#6#7'Caption'#6#11'BracketLink'#10'Font.Color'#7#6
+'clBlue'#11'ParentColor'#8#10'ParentFont'#8#7'OnClick'#7#20'MarkupColorLinkC'
+'lick'#12'OnMouseEnter'#7#21'BracketLinkMouseEnter'#12'OnMouseLeave'#7#21'Br'
+'acketLinkMouseLeave'#0#0#242#2#15#9'TCheckBox AutoIdentifierCompletionCheck'
+'Box'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Ow'
+'ner'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#0#5'Width'#3#252#0#18'BorderSpacin'
+'g.Left'#2#6#7'Caption'#6' AutoIdentifierCompletionCheckBox'#8'TabOrder'#2#0
+#0#0#242#2#16#9'TCheckBox'#28'AutoRemoveEmptyMethodsOnSave'#22'AnchorSideLef'
+'t.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7' AutoIdentifierCompletion'
+'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3
+'Top'#2#28#5'Width'#3#255#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'
+#2#6#7'Caption'#6#28'AutoRemoveEmptyMethodsOnSave'#8'TabOrder'#2#1#0#0#242#2
+#17#9'TCheckBox'#28'AutoToolTipSymbToolsCheckBox'#22'AnchorSideLeft.Control'
+#7#5'Owner'#21'AnchorSideTop.Control'#7#28'AutoRemoveEmptyMethodsOnSave'#18
+'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'8'#5
+'Width'#3#235#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Capti'
+'on'#6#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'#2#2#0#0#242#2#18#9'TChec'
+'kBox'#25'AutoCompleteBlockCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+'AnchorSideTop.Control'#7#28'AutoToolTipSymbToolsCheckBox'#18'AnchorSideTop.'
+'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'T'#5'Width'#3#218#0
+#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#25'AutoCo'
+'mpleteBlockCheckBox'#8'TabOrder'#2#3#0#0#242#2#19#9'TCheckBox'#27'AutoToolT'
+'ipExprEvalCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.'
+'Control'#7#12'ToolTipBevel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+#6#6'Height'#2#22#3'Top'#2'z'#5'Width'#3#222#0#18'BorderSpacing.Left'#2#6#17
+'BorderSpacing.Top'#2#6#7'Caption'#6#27'AutoToolTipExprEvalCheckBox'#8'TabOr'
+'der'#2#4#0#0#242#2#20#9'TTrackBar'#17'AutoDelayTrackBar'#22'AnchorSideLeft.'
+'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#27'AutoToolTipExprEvalCheck'
+'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'('#3
+'Top'#3#150#0#5'Width'#3#13#2#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3
+#244#1#8'Position'#3#244#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
+'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
+#6#8'TabOrder'#2#5#0#0#242#2#21#9'TTrackBar'#22'MarkupWordTimeTrackBar'#22'A'
+'ft'#2#6#6'Height'#2'('#3'Top'#3#128#0#5'Width'#3#13#2#9'Frequency'#3#250#0#3
+'Max'#3#160#15#3'Min'#3#244#1#8'Position'#3#244#1#7'Anchors'#11#5'akTop'#6'a'
+'kLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19
+'BorderSpacing.Right'#2#6#8'TabOrder'#2#4#0#0#242#2#20#9'TTrackBar'#22'Marku'
+'pWordTimeTrackBar'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.C'
+'ontrol'#7#14'MarkupWordTrim'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Ancho'
+'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
+'ft'#2#6#6'Height'#2'('#3'Top'#3'K'#1#5'Width'#3#13#2#9'Frequency'#3#250#0#3
+'Max'#3#160#15#3'Min'#3#244#1#8'Position'#3#244#1#7'Anchors'#11#5'akTop'#6'a'
+'kLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19
+'BorderSpacing.Right'#2#6#8'TabOrder'#2#5#0#0#242#2#21#9'TCheckBox'#22'Marku'
+'pWordFullCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.C'
+'ontrol'#7#25'MarkupWordNoTimerCheckBox'#18'AnchorSideTop.Side'#7#9'asrBotto'
+'m'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#246#0#5'Width'#3#185#0#18'BorderSpac'
+'ing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#22'MarkupWordFullCheck'
+'Box'#8'TabOrder'#2#6#0#0#242#2#22#9'TCheckBox'#19'MarkupWordNoKeyword'#22'A'
+'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'MarkupWord'
+'Trim'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'('#3
+'Top'#3'a'#1#5'Width'#3#13#2#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3
+#244#1#8'Position'#3#244#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
+'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
+#6#8'TabOrder'#2#6#0#0#242#2#22#9'TCheckBox'#22'MarkupWordFullCheckBox'#22'A'
+'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#25'MarkupWord'
+'NoTimerCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+#2#22#3'Top'#3#12#1#5'Width'#3#194#0#18'BorderSpacing.Left'#2#6#17'BorderSpa'
+'cing.Top'#2#6#7'Caption'#6#22'MarkupWordFullCheckBox'#8'TabOrder'#2#7#0#0
,#242#2#23#9'TCheckBox'#19'MarkupWordNoKeyword'#22'AnchorSideLeft.Control'#7#5
+'Owner'#21'AnchorSideTop.Control'#7#14'MarkupWordTrim'#18'AnchorSideTop.Side'
+#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#22#3'Top'#3'E'#1#5'Width'#3#180#0#18
+'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#19'MarkupWor'
+'dNoKeyword'#8'TabOrder'#2#8#0#0#242#2#24#9'TSpinEdit'#21'MarkupWordFullLenS'
+'pin'#22'AnchorSideLeft.Control'#7#22'MarkupWordFullLenLabel'#19'AnchorSideL'
+'eft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#22'MarkupWordFullLenLa'
+'bel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5
+'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#176#0#6'Height'#2
+#27#3'Top'#3'$'#1#5'Width'#2'0'#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#9#0
+#0#242#2#25#9'TCheckBox'#25'MarkupWordNoTimerCheckBox'#22'AnchorSideLeft.Con'
+'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#20'MarkupWordGroupLabel'#18'An'
+'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#240#0#5
+'Width'#3#227#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Capti'
+'on'#6#25'MarkupWordNoTimerCheckBox'#8'TabOrder'#2#10#0#0#242#2#26#9'TCheckB'
+'ox'#14'MarkupWordTrim'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideT'
+'op.Control'#7#21'MarkupWordFullLenSpin'#18'AnchorSideTop.Side'#7#9'asrBotto'
+'m'#4'Left'#3#230#0#6'Height'#2#22#3'Top'#3'E'#1#5'Width'#3#134#0#18'BorderS'
+'pacing.Left'#3#230#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#14'MarkupWordTr'
+'im'#8'TabOrder'#2#11#0#0#242#2#27#9'TComboBox'#12'BracketCombo'#22'AnchorSi'
+'deLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#11'MarkupBevel'#18'A'
+'nchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21
+'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#31#3'Top'#3
+#173#1#5'Width'#3#150#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6
+#10'ItemHeight'#2#0#8'OnChange'#7#18'BracketComboChange'#6'OnExit'#7#16'Brac'
+'ketComboExit'#9'OnKeyDown'#7#19'BracketComboKeyDown'#5'Style'#7#14'csDropDo'
+'wnList'#8'TabOrder'#2#12#0#0#0
+'Trim'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#22#3'To'
+'p'#3'/'#1#5'Width'#3#172#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'
+#2#6#7'Caption'#6#19'MarkupWordNoKeyword'#8'TabOrder'#2#7#0#0#242#2#23#9'TSp'
,'inEdit'#21'MarkupWordFullLenSpin'#22'AnchorSideLeft.Control'#7#22'MarkupWor'
+'dFullLenLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
+'rol'#7#22'MarkupWordFullLenLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23
+'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
+#4'Left'#3#168#0#6'Height'#2#27#3'Top'#3#14#1#5'Width'#2'0'#18'BorderSpacing'
+'.Left'#2#6#8'TabOrder'#2#8#0#0#242#2#24#9'TCheckBox'#25'MarkupWordNoTimerCh'
+'eckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#20
+'MarkupWordGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
+'eight'#2#22#3'Top'#3#218#0#5'Width'#3#219#0#18'BorderSpacing.Left'#2#6#17'B'
+'orderSpacing.Top'#2#6#7'Caption'#6#25'MarkupWordNoTimerCheckBox'#8'TabOrder'
+#2#9#0#0#242#2#25#9'TCheckBox'#14'MarkupWordTrim'#22'AnchorSideLeft.Control'
+#7#5'Owner'#21'AnchorSideTop.Control'#7#21'MarkupWordFullLenSpin'#18'AnchorS'
+'ideTop.Side'#7#9'asrBottom'#4'Left'#3#230#0#6'Height'#2#22#3'Top'#3'/'#1#5
+'Width'#3#128#0#18'BorderSpacing.Left'#3#230#0#17'BorderSpacing.Top'#2#6#7'C'
+'aption'#6#14'MarkupWordTrim'#8'TabOrder'#2#10#0#0#242#2#26#9'TComboBox'#12
+'BracketCombo'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contro'
+'l'#7#11'MarkupBevel'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBot'
+'tom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6
+#6'Height'#2#31#3'Top'#3#151#1#5'Width'#3#150#0#18'BorderSpacing.Left'#2#6#17
+'BorderSpacing.Top'#2#6#10'ItemHeight'#2#0#8'OnChange'#7#18'BracketComboChan'
+'ge'#6'OnExit'#7#16'BracketComboExit'#9'OnKeyDown'#7#19'BracketComboKeyDown'
+#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#11#0#0#0
]);

View File

@ -39,7 +39,6 @@ type
AutoDelayMaxLabel: TLabel;
AutoDelayMinLabel: TLabel;
AutoDelayTrackBar: TTrackBar;
AutoIdentifierCompletionCheckBox: TCheckBox;
AutoToolTipExprEvalCheckBox: TCheckBox;
BracketCombo: TComboBox;
BracketLabel: TLabel;
@ -162,7 +161,6 @@ procedure TEditorCodetoolsOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDial
begin
FDialog := ADialog;
AutoIdentifierCompletionCheckBox.Caption := dlgEdIdComlet;
AutoCompleteBlockCheckBox.Caption := dlgEdCompleteBlocks;
AutoToolTipExprEvalCheckBox.Caption := dlgTooltipEval;
AutoToolTipSymbToolsCheckBox.Caption := dlgTooltipTools;
@ -196,7 +194,6 @@ procedure TEditorCodetoolsOptionsFrame.ReadSettings(AOptions: TAbstractIDEOption
begin
with AOptions as TEditorOptions do
begin
AutoIdentifierCompletionCheckBox.Checked := AutoIdentifierCompletion;
AutoCompleteBlockCheckBox.Checked := AutoBlockCompletion;
AutoToolTipExprEvalCheckBox.Checked := AutoToolTipExprEval;
AutoToolTipSymbToolsCheckBox.Checked := AutoToolTipSymbTools;
@ -220,7 +217,6 @@ procedure TEditorCodetoolsOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptio
begin
with AOptions as TEditorOptions do
begin
AutoIdentifierCompletion := AutoIdentifierCompletionCheckBox.Checked;
AutoBlockCompletion := AutoCompleteBlockCheckBox.Checked;
AutoToolTipExprEval := AutoToolTipExprEvalCheckBox.Checked;
AutoToolTipSymbTools := AutoToolTipSymbToolsCheckBox.Checked;

View File

@ -60,7 +60,7 @@ uses
WordCompletion, FindReplaceDialog, FindInFilesDlg, IDEProcs, IDEOptionDefs,
MacroPromptDlg, TransferMacros, CodeContextForm, SrcEditHintFrm,
EnvironmentOpts, MsgView, SearchResultView, InputHistory, CodeMacroPrompt,
CodeTemplatesDlg, TodoDlg, TodoList,
CodeTemplatesDlg, TodoDlg, TodoList, CodeToolsOptions,
SortSelectionDlg, EncloseSelectionDlg, DiffDialog, ConDef, InvertAssignTool,
SourceEditProcs, SourceMarks, CharacterMapDlg, SearchFrm,
FPDocHints, FPDocEditWindow,
@ -1563,7 +1563,7 @@ begin
end else if (not FEditor.IsIdentChar(aChar))
and AutoCompleteChar(aChar,AddChar,acoWordEnd) then begin
// completed
end else if EditorOpts.AutoIdentifierCompletion then begin
end else if CodeToolsOpts.IdentComplAutoStartAfterPoint then begin
// store caret position to detect caret changes
SourceCompletionCaretXY:=FEditor.CaretXY;
// add the char