ide: code explorer

- add an option to ignore constants in the list of functions to the options frame - don't remove default values on load if there is no "codeexploreroptions.xml" (or defaults will gone on first use) git-svn-id: trunk@19510 -
2025-12-29 13:00:34 +01:00 · 2009-04-19 11:23:22 +00:00 · 2009-04-19 11:23:22 +00:00 · dcc7ce6884
commit dcc7ce6884
parent ae200cf7bc
6 changed files with 151 additions and 100 deletions
--- a/ide/codeexplopts.pas
+++ b/ide/codeexplopts.pas
@ -359,9 +359,12 @@ var
  XMLConfig: TXMLConfig;
  //FileVersion: integer;
 begin
-  if not FileExistsUTF8(FOptionsFilename) then begin
+  if not FileExistsUTF8(FOptionsFilename) then
+  begin
    Clear;
-    exit;
+    LoadDefaults_IgnoreFigureConstants;
+    LoadDefaults_IgnoreFigConstInFuncs;
+    Exit;
  end;
  try
    XMLConfig:=TXMLConfig.Create(FOptionsFilename);
--- a/ide/frames/codeexplorer_figures_options.lfm
+++ b/ide/frames/codeexplorer_figures_options.lfm
@ -1,27 +1,39 @@
 inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
  Height = 396
  Width = 478
-  ClientHeight = 392
-  ClientWidth = 474
+  ClientHeight = 396
+  ClientWidth = 478
  TabOrder = 0
-  DesignLeft = 621
-  DesignTop = 269
+  DesignLeft = 681
+  DesignTop = 339
  object IgnoreFigureConstantsLabel: TLabel[0]
    AnchorSideLeft.Control = FigureLeftPanel
    AnchorSideLeft.Side = asrBottom
    AnchorSideTop.Control = FigureCategoriesCheckGroup
    AnchorSideTop.Side = asrBottom
    AnchorSideBottom.Control = FigureCharConstCheckBox
-    Left = 202
-    Height = 18
+    Left = 155
+    Height = 14
    Top = 56
-    Width = 178
+    Width = 137
    BorderSpacing.Left = 10
    BorderSpacing.Top = 6
    Caption = 'IgnoreFigureConstantsLabel'
    ParentColor = False
  end
-  object FigureCategoriesCheckGroup: TCheckGroup[1]
+  object IgnoreFigConstInFuncsLabel: TLabel[1]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = FigureLeftPanel
+    AnchorSideTop.Side = asrBottom
+    Left = 0
+    Height = 14
+    Top = 223
+    Width = 138
+    BorderSpacing.Top = 6
+    Caption = 'IgnoreFigConstInFuncsLabel'
+    ParentColor = False
+  end
+  object FigureCategoriesCheckGroup: TCheckGroup[2]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    AnchorSideRight.Control = Owner
@ -31,7 +43,7 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
    Left = 0
    Height = 50
    Top = 0
-    Width = 474
+    Width = 478
    Anchors = [akTop, akLeft, akRight]
    AutoFill = True
    AutoSize = True
@ -47,18 +59,18 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
    Constraints.MinHeight = 50
    TabOrder = 0
  end
-  object IgnoreFigureConstantsMemo: TMemo[2]
+  object IgnoreFigureConstantsMemo: TMemo[3]
    AnchorSideLeft.Control = IgnoreFigureConstantsLabel
    AnchorSideTop.Control = IgnoreFigureConstantsLabel
    AnchorSideTop.Side = asrBottom
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Control = FigureLeftPanel
    AnchorSideBottom.Side = asrBottom
-    Left = 202
-    Height = 315
-    Top = 77
-    Width = 272
+    Left = 155
+    Height = 144
+    Top = 73
+    Width = 323
    Anchors = [akTop, akLeft, akRight, akBottom]
    BorderSpacing.Top = 3
    Lines.Strings = (
@ -66,28 +78,28 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
    )
    TabOrder = 1
  end
-  object FigureLeftPanel: TPanel[3]
+  object FigureLeftPanel: TPanel[4]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = FigureCategoriesCheckGroup
    AnchorSideTop.Side = asrBottom
    Left = 0
-    Height = 178
+    Height = 161
    Top = 56
-    Width = 192
+    Width = 145
    AutoSize = True
    BorderSpacing.Top = 6
    BevelOuter = bvNone
-    ClientHeight = 178
-    ClientWidth = 192
+    ClientHeight = 161
+    ClientWidth = 145
    TabOrder = 2
    object NestedProcCountLabel: TLabel
      AnchorSideLeft.Control = FigureLeftPanel
      AnchorSideTop.Control = LongParamListCountSpinEdit
      AnchorSideTop.Side = asrBottom
      Left = 0
-      Height = 18
-      Top = 106
-      Width = 147
+      Height = 14
+      Top = 98
+      Width = 110
      BorderSpacing.Top = 6
      Caption = 'NestedProcCountLabel'
      ParentColor = False
@ -97,9 +109,9 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
      AnchorSideTop.Control = LongProcLineCountSpinEdit
      AnchorSideTop.Side = asrBottom
      Left = 0
-      Height = 18
-      Top = 56
-      Width = 167
+      Height = 14
+      Top = 52
+      Width = 124
      BorderSpacing.Top = 6
      Caption = 'LongParamListCountLabel'
      ParentColor = False
@ -108,9 +120,9 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
      AnchorSideLeft.Control = FigureLeftPanel
      AnchorSideTop.Control = FigureLeftPanel
      Left = 0
-      Height = 18
+      Height = 14
      Top = 6
-      Width = 158
+      Width = 118
      BorderSpacing.Top = 6
      Caption = 'LongProcLineCountLabel'
      ParentColor = False
@ -120,9 +132,9 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
      AnchorSideTop.Control = NestedProcCountSpinEdit
      AnchorSideTop.Side = asrBottom
      Left = 0
-      Height = 22
-      Top = 156
-      Width = 192
+      Height = 17
+      Top = 144
+      Width = 145
      BorderSpacing.Top = 6
      Caption = 'FigureCharConstCheckBox'
      TabOrder = 0
@ -133,7 +145,7 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
      AnchorSideTop.Side = asrBottom
      Left = 6
      Height = 23
-      Top = 127
+      Top = 115
      Width = 60
      BorderSpacing.Left = 6
      BorderSpacing.Top = 3
@ -145,7 +157,7 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
      AnchorSideTop.Side = asrBottom
      Left = 6
      Height = 23
-      Top = 77
+      Top = 69
      Width = 60
      BorderSpacing.Left = 6
      BorderSpacing.Top = 3
@ -157,11 +169,30 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
      AnchorSideTop.Side = asrBottom
      Left = 6
      Height = 23
-      Top = 27
+      Top = 23
      Width = 60
      BorderSpacing.Left = 6
      BorderSpacing.Top = 3
      TabOrder = 3
    end
  end
+  object IgnoreFigConstInFuncsMemo: TMemo[5]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = IgnoreFigConstInFuncsLabel
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 0
+    Height = 156
+    Top = 240
+    Width = 478
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.Top = 3
+    Lines.Strings = (
+      'IgnoreFigConstInFuncsMemo'
+    )
+    TabOrder = 3
+  end
 end
--- a/ide/frames/codeexplorer_figures_options.lrs
+++ b/ide/frames/codeexplorer_figures_options.lrs
@ -1,68 +1,77 @@
-{ This is an automatically generated lazarus resource file }
-
 LazarusResources.Add('TCodeExplorerFiguresOptionsFrame','FORMDATA',[
  'TPF0'#241' TCodeExplorerFiguresOptionsFrame'#31'CodeExplorerFiguresOptionsFr'
-  +'ame'#6'Height'#3#140#1#5'Width'#3#222#1#12'ClientHeight'#3#136#1#11'ClientW'
-  +'idth'#3#218#1#8'TabOrder'#2#0#10'DesignLeft'#3'm'#2#9'DesignTop'#3#13#1#0
+  +'ame'#6'Height'#3#140#1#5'Width'#3#222#1#12'ClientHeight'#3#140#1#11'ClientW'
+  +'idth'#3#222#1#8'TabOrder'#2#0#10'DesignLeft'#3#169#2#9'DesignTop'#3'S'#1#0
  +#242#2#0#6'TLabel'#26'IgnoreFigureConstantsLabel'#22'AnchorSideLeft.Control'
  +#7#15'FigureLeftPanel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
  +'op.Control'#7#26'FigureCategoriesCheckGroup'#18'AnchorSideTop.Side'#7#9'asr'
  +'Bottom'#24'AnchorSideBottom.Control'#7#23'FigureCharConstCheckBox'#4'Left'#3
-  +#202#0#6'Height'#2#18#3'Top'#2'8'#5'Width'#3#178#0#18'BorderSpacing.Left'#2
+  +#155#0#6'Height'#2#14#3'Top'#2'8'#5'Width'#3#137#0#18'BorderSpacing.Left'#2
  +#10#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'IgnoreFigureConstantsLabel'#11
-  +'ParentColor'#8#0#0#242#2#1#11'TCheckGroup'#26'FigureCategoriesCheckGroup'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23
-  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#2#0#6'Height'#2'2'#3'Top'#2#0#5'Width'#3#218#1#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#8'AutoSize'#9#7'Caption'#6#26'F'
-  +'igureCategoriesCheckGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSiz'
-  +'ing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogen'
-  +'ousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResi'
-  +'ze'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Sh'
-  +'rinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRig'
-  +'htThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#21'Constraints.MinHe'
-  +'ight'#2'2'#8'TabOrder'#2#0#0#0#242#2#2#5'TMemo'#25'IgnoreFigureConstantsMem'
-  +'o'#22'AnchorSideLeft.Control'#7#26'IgnoreFigureConstantsLabel'#21'AnchorSid'
-  +'eTop.Control'#7#26'IgnoreFigureConstantsLabel'#18'AnchorSideTop.Side'#7#9'a'
-  +'srBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Si'
-  +'de'#7#9'asrBottom'#4'Left'#3#202#0#6'Height'#3';'#1#3'Top'#2'M'#5'Width'#3
-  +#16#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpa'
-  +'cing.Top'#2#3#13'Lines.Strings'#1#6#25'IgnoreFigureConstantsMemo'#0#8'TabOr'
-  +'der'#2#1#0#0#242#2#3#6'TPanel'#15'FigureLeftPanel'#22'AnchorSideLeft.Contro'
-  +'l'#7#5'Owner'#21'AnchorSideTop.Control'#7#26'FigureCategoriesCheckGroup'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#178#0#3'Top'#2'8'
-  +#5'Width'#3#192#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#10'BevelOuter'#7#6
-  +'bvNone'#12'ClientHeight'#3#178#0#11'ClientWidth'#3#192#0#8'TabOrder'#2#2#0#6
-  +'TLabel'#20'NestedProcCountLabel'#22'AnchorSideLeft.Control'#7#15'FigureLeft'
-  +'Panel'#21'AnchorSideTop.Control'#7#26'LongParamListCountSpinEdit'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#18#3'Top'#2'j'#5'Width'
-  +#3#147#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#20'NestedProcCountLabel'#11
-  +'ParentColor'#8#0#0#6'TLabel'#23'LongParamListCountLabel'#22'AnchorSideLeft.'
-  +'Control'#7#15'FigureLeftPanel'#21'AnchorSideTop.Control'#7#25'LongProcLineC'
-  +'ountSpinEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2
-  +#18#3'Top'#2'8'#5'Width'#3#167#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'L'
-  +'ongParamListCountLabel'#11'ParentColor'#8#0#0#6'TLabel'#22'LongProcLineCoun'
-  +'tLabel'#22'AnchorSideLeft.Control'#7#15'FigureLeftPanel'#21'AnchorSideTop.C'
-  +'ontrol'#7#15'FigureLeftPanel'#4'Left'#2#0#6'Height'#2#18#3'Top'#2#6#5'Width'
-  +#3#158#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#22'LongProcLineCountLabel'#11
-  +'ParentColor'#8#0#0#9'TCheckBox'#23'FigureCharConstCheckBox'#22'AnchorSideLe'
-  +'ft.Control'#7#15'FigureLeftPanel'#21'AnchorSideTop.Control'#7#23'NestedProc'
-  +'CountSpinEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2
-  +#22#3'Top'#3#156#0#5'Width'#3#192#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#23
-  +'FigureCharConstCheckBox'#8'TabOrder'#2#0#0#0#9'TSpinEdit'#23'NestedProcCoun'
-  +'tSpinEdit'#22'AnchorSideLeft.Control'#7#23'FigureCharConstCheckBox'#21'Anch'
-  +'orSideTop.Control'#7#20'NestedProcCountLabel'#18'AnchorSideTop.Side'#7#9'as'
-  +'rBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2''#5'Width'#2'<'#18'BorderSpac'
-  +'ing.Left'#2#6#17'BorderSpacing.Top'#2#3#8'TabOrder'#2#1#0#0#9'TSpinEdit'#26
-  +'LongParamListCountSpinEdit'#22'AnchorSideLeft.Control'#7#15'FigureLeftPanel'
-  +#21'AnchorSideTop.Control'#7#23'LongParamListCountLabel'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'M'#5'Width'#2'<'#18
-  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#8'TabOrder'#2#2#0#0#9'TSp'
-  +'inEdit'#25'LongProcLineCountSpinEdit'#22'AnchorSideLeft.Control'#7#15'Figur'
-  +'eLeftPanel'#21'AnchorSideTop.Control'#7#22'LongProcLineCountLabel'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#27#5'Widt'
-  +'h'#2'<'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#8'TabOrder'#2#3
-  +#0#0#0#0
+  +'ParentColor'#8#0#0#242#2#1#6'TLabel'#26'IgnoreFigConstInFuncsLabel'#22'Anch'
+  +'orSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'FigureLeftPan'
+  +'el'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'
+  +#3#223#0#5'Width'#3#138#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#26'IgnoreFi'
+  +'gConstInFuncsLabel'#11'ParentColor'#8#0#0#242#2#2#11'TCheckGroup'#26'Figure'
+  +'CategoriesCheckGroup'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTo'
+  +'p.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anchor'
+  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2'2'#3'Top'#2#0#5'Wid'
+  +'th'#3#222#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#8'A'
+  +'utoSize'#9#7'Caption'#6#26'FigureCategoriesCheckGroup'#28'ChildSizing.LeftR'
+  +'ightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enlarg'
+  +'eHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'
+  +#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsSca'
+  +'leChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizin'
+  +'g.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLin'
+  +'e'#2#1#21'Constraints.MinHeight'#2'2'#8'TabOrder'#2#0#0#0#242#2#3#5'TMemo'
+  +#25'IgnoreFigureConstantsMemo'#22'AnchorSideLeft.Control'#7#26'IgnoreFigureC'
+  +'onstantsLabel'#21'AnchorSideTop.Control'#7#26'IgnoreFigureConstantsLabel'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'Figu'
+  +'reLeftPanel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#155#0#6'Hei'
+  +'ght'#3#144#0#3'Top'#2'I'#5'Width'#3'C'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#3#13'Lines.Strings'#1#6#25'I'
+  +'gnoreFigureConstantsMemo'#0#8'TabOrder'#2#1#0#0#242#2#4#6'TPanel'#15'Figure'
+  +'LeftPanel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#26'FigureCategoriesCheckGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2#0#6'Height'#3#161#0#3'Top'#2'8'#5'Width'#3#145#0#8'AutoSize'#9#17'BorderS'
+  +'pacing.Top'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#3#161#0#11'Clie'
+  +'ntWidth'#3#145#0#8'TabOrder'#2#2#0#6'TLabel'#20'NestedProcCountLabel'#22'An'
+  +'chorSideLeft.Control'#7#15'FigureLeftPanel'#21'AnchorSideTop.Control'#7#26
+  +'LongParamListCountSpinEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#0#6'Height'#2#14#3'Top'#2'b'#5'Width'#2'n'#17'BorderSpacing.Top'#2#6#7'Capt'
+  +'ion'#6#20'NestedProcCountLabel'#11'ParentColor'#8#0#0#6'TLabel'#23'LongPara'
+  +'mListCountLabel'#22'AnchorSideLeft.Control'#7#15'FigureLeftPanel'#21'Anchor'
+  +'SideTop.Control'#7#25'LongProcLineCountSpinEdit'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#2'4'#5'Width'#2'|'#17'BorderSp'
+  +'acing.Top'#2#6#7'Caption'#6#23'LongParamListCountLabel'#11'ParentColor'#8#0
+  +#0#6'TLabel'#22'LongProcLineCountLabel'#22'AnchorSideLeft.Control'#7#15'Figu'
+  +'reLeftPanel'#21'AnchorSideTop.Control'#7#15'FigureLeftPanel'#4'Left'#2#0#6
+  +'Height'#2#14#3'Top'#2#6#5'Width'#2'v'#17'BorderSpacing.Top'#2#6#7'Caption'#6
+  +#22'LongProcLineCountLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#23'FigureChar'
+  +'ConstCheckBox'#22'AnchorSideLeft.Control'#7#15'FigureLeftPanel'#21'AnchorSi'
+  +'deTop.Control'#7#23'NestedProcCountSpinEdit'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Bottom'#4'Left'#2#0#6'Height'#2#17#3'Top'#3#144#0#5'Width'#3#145#0#17'Borde'
+  +'rSpacing.Top'#2#6#7'Caption'#6#23'FigureCharConstCheckBox'#8'TabOrder'#2#0#0
+  +#0#9'TSpinEdit'#23'NestedProcCountSpinEdit'#22'AnchorSideLeft.Control'#7#23
+  +'FigureCharConstCheckBox'#21'AnchorSideTop.Control'#7#20'NestedProcCountLabe'
+  +'l'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2
+  +'s'#5'Width'#2'<'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#8'Tab'
+  +'Order'#2#1#0#0#9'TSpinEdit'#26'LongParamListCountSpinEdit'#22'AnchorSideLef'
+  +'t.Control'#7#15'FigureLeftPanel'#21'AnchorSideTop.Control'#7#23'LongParamLi'
+  +'stCountLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#23#3'Top'#2'E'#5'Width'#2'<'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.To'
+  +'p'#2#3#8'TabOrder'#2#2#0#0#9'TSpinEdit'#25'LongProcLineCountSpinEdit'#22'An'
+  ,'chorSideLeft.Control'#7#15'FigureLeftPanel'#21'AnchorSideTop.Control'#7#22
+  +'LongProcLineCountLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2#23#3'Top'#2#23#5'Width'#2'<'#18'BorderSpacing.Left'#2#6#17'Border'
+  +'Spacing.Top'#2#3#8'TabOrder'#2#3#0#0#0#242#2#5#5'TMemo'#25'IgnoreFigConstIn'
+  +'FuncsMemo'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#26'IgnoreFigConstInFuncsLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
+  +'horSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
+  +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2#0#6'Height'#3#156#0#3'Top'#3#240#0#5'Width'#3#222#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'BorderSpacing.Top'#2#3#13
+  +'Lines.Strings'#1#6#25'IgnoreFigConstInFuncsMemo'#0#8'TabOrder'#2#3#0#0#0
 ]);
--- a/ide/frames/codeexplorer_figures_options.pas
+++ b/ide/frames/codeexplorer_figures_options.pas
@ -36,9 +36,11 @@ type
    FigureCharConstCheckBox: TCheckBox;
    FigureCategoriesCheckGroup: TCheckGroup;
    IgnoreFigureConstantsLabel: TLabel;
+    IgnoreFigConstInFuncsLabel: TLabel;
    LongProcLineCountLabel: TLabel;
    LongParamListCountLabel: TLabel;
    IgnoreFigureConstantsMemo: TMemo;
+    IgnoreFigConstInFuncsMemo: TMemo;
    NestedProcCountLabel: TLabel;
    LongProcLineCountSpinEdit: TSpinEdit;
    LongParamListCountSpinEdit: TSpinEdit;
@ -74,7 +76,8 @@ begin
  LongParamListCountLabel.Caption := lisCELongParamListCount;
  NestedProcCountLabel.Caption := lisCENestedProcCount;
  FigureCharConstCheckBox.Caption := lisCEFigureCharConst;
-  IgnoreFigureConstantsLabel.Caption := lisCENotFigureConstants;
+  IgnoreFigureConstantsLabel.Caption := lisCEIgnoreFigureConstants;
+  IgnoreFigConstInFuncsLabel.Caption := lisCEIgnoreFigConstInFuncs;
 end;

 procedure TCodeExplorerFiguresOptionsFrame.ReadSettings(
@ -95,6 +98,9 @@ begin
    Tmp := CreateListOfIgnoreFigureConstants;
    IgnoreFigureConstantsMemo.Lines.Assign(Tmp);
    Tmp.Free;
+    Tmp := CreateListOfIgnoreFigConstInFuncs;
+    IgnoreFigConstInFuncsMemo.Lines.Assign(Tmp);
+    Tmp.Free;
  end;
 end;

@ -115,7 +121,8 @@ begin
    LongParamListCount := LongParamListCountSpinEdit.Value;
    NestedProcCount := NestedProcCountSpinEdit.Value;
    FigureCharConst := FigureCharConstCheckBox.Checked;
-    SetListOf_IgnoreFigureConstants(IgnoreFigureConstantsMemo.Lines,false);
+    SetListOf_IgnoreFigureConstants(IgnoreFigureConstantsMemo.Lines, False);
+    SetListOf_IgnoreFigConstInFuncs(IgnoreFigConstInFuncsMemo.Lines, False);
  end;
 end;

--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@ -92,7 +92,7 @@
        <ComponentName Value="BackupOptionsFrame"/>
        <IsPartOfProject Value="True"/>
        <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="backup_options"/>
+        <UnitName Value="Backup_Options"/>
      </Unit7>
      <Unit8>
        <Filename Value="frames/naming_options.pas"/>
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@ -4163,7 +4163,8 @@ resourcestring
  lisCELongParamListCount = 'Parameters count treating as "many"';
  lisCENestedProcCount = 'Nested procedures count treating as "many"';
  lisCEFigureCharConst = 'Search for unnamed char constants';
-  lisCENotFigureConstants = 'Unnamed constants to skip';
+  lisCEIgnoreFigureConstants = 'Ignore next unnamed constants';
+  lisCEIgnoreFigConstInFuncs = 'Ignore constants in next functions';

 implementation