IDE: improved figures options layout

git-svn-id: trunk@19497 -
2025-08-28 21:00:43 +02:00 · 2009-04-18 22:14:01 +00:00 · 2009-04-18 22:14:01 +00:00 · fd0c8eea1e
commit fd0c8eea1e
parent 09ce768fa7
5 changed files with 237 additions and 214 deletions
--- a/ide/codeexplopts.pas
+++ b/ide/codeexplopts.pas
@ -108,7 +108,7 @@ type
    FFigures: TCEFigureCategories;
    FFollowCursor: boolean;
    FMode : TCodeExplorerMode;
-    FNotFigureConstants: TAvgLvlTree;// tree of AnsiString
+    FIgnoreFigureConstants: TAvgLvlTree;// tree of AnsiString
    FOptionsFilename: string;
    FRefresh: TCodeExplorerRefresh;
  public
@ -121,13 +121,13 @@ type
    procedure LoadFromXMLConfig(XMLConfig: TXMLConfig; const Path: string);
    procedure SaveToXMLConfig(XMLConfig: TXMLConfig; const Path: string);
    function CreateListOfNotFigureConstants: TStrings;
-    procedure ClearNotFigureConstants;
-    procedure SetListOfNotFigureConstants(List: TStrings; Add: boolean);
-    procedure LoadNotFigureConstantsToDefaults;
-    function NotFigureConstant(p: PChar): boolean;// test if atom is in NotFigureConstants
-    procedure AddNotFigureConstant(const Atom: string);
-    function IsNotFigureConstantsDefault(Exactly: boolean): boolean;
-    function IsNotFigureConstantDefault(const Atom: string): boolean;
+    procedure Clear_IgnoreFigureConstants;
+    procedure SetListOf_IgnoreFigureConstants(List: TStrings; Add: boolean);
+    procedure LoadDefaults_IgnoreFigureConstants;
+    function IgnoreFigureConstant(p: PChar): boolean;// test if atom is in NotFigureConstants
+    procedure Add_IgnoreFigureConstant(const Atom: string);
+    function IgnoreFigureConstants_AreDefault(Exactly: boolean): boolean;
+    function IgnoreFigureConstant_IsDefault(const Atom: string): boolean;
  public
    property Refresh: TCodeExplorerRefresh read FRefresh write FRefresh default cerSwitchEditorPage;
    property Mode: TCodeExplorerMode read FMode write FMode default cemCategory;
@ -140,7 +140,7 @@ type
    property LongParamListCount: integer read FLongParamListCount write FLongParamListCount default DefaultFigLongParamListCount;
    property NestedProcCount: integer read FNestedProcCount write FNestedProcCount default DefaultFigNestedProcCount;
    property FigureCharConst: boolean read FFigureCharConst write FFigureCharConst default DefaultFigureCharConst;
-    property NotFigureConstants: TAvgLvlTree read FNotFigureConstants;
+    property IgnoreFigureConstants: TAvgLvlTree read FIgnoreFigureConstants;
  end;

 const
@ -259,16 +259,16 @@ constructor TCodeExplorerOptions.Create;
 begin
  FOptionsFilename:=
                AppendPathDelim(GetPrimaryConfigPath)+'codeexploreroptions.xml';
-  FNotFigureConstants:=TAvgLvlTree.Create(TListSortCompare(@CompareAtom));
+  FIgnoreFigureConstants:=TAvgLvlTree.Create(TListSortCompare(@CompareAtom));
  Clear;
-  AddNotFigureConstant('0');
-  AddNotFigureConstant('1');
+  Add_IgnoreFigureConstant('0');
+  Add_IgnoreFigureConstant('1');
 end;

 destructor TCodeExplorerOptions.Destroy;
 begin
-  ClearNotFigureConstants;
-  FreeAndNil(FNotFigureConstants);
+  Clear_IgnoreFigureConstants;
+  FreeAndNil(FIgnoreFigureConstants);
  inherited Destroy;
 end;

@ -283,7 +283,7 @@ begin
  FLongParamListCount:=DefaultFigLongParamListCount;
  FNestedProcCount:=DefaultFigNestedProcCount;
  FFigureCharConst:=DefaultFigureCharConst;
-  ClearNotFigureConstants;
+  Clear_IgnoreFigureConstants;
 end;

 procedure TCodeExplorerOptions.Assign(Source: TPersistent);
@ -304,7 +304,7 @@ begin
    FFigureCharConst:=Src.FigureCharConst;
    List:=Src.CreateListOfNotFigureConstants;
    try
-      SetListOfNotFigureConstants(List,false);
+      SetListOf_IgnoreFigureConstants(List,false);
    finally
      List.Free;
    end;
@ -393,14 +393,14 @@ begin
      begin
        FFigureCharConst:=XMLConfig.GetValue(CurPath+'CharConsts/Value',
                                                 DefaultFigureCharConst);
-        // load standard NotFigureConstants
+        // load standard IgnoreFigureConstants
        if XMLConfig.GetValue(CurPath+'Ignore/ContainsDefaults',true) then
-          LoadNotFigureConstantsToDefaults;
-        // load custom NotFigureConstants
+          LoadDefaults_IgnoreFigureConstants;
+        // load custom IgnoreFigureConstants
        List:=TStringList.Create;
        try
          LoadStringList(XMLConfig,List,CurPath+'Ignore/');
-          SetListOfNotFigureConstants(List,true);
+          SetListOf_IgnoreFigureConstants(List,true);
        finally
          List.Free;
        end;
@ -449,15 +449,15 @@ begin
      begin
        XMLConfig.SetDeleteValue(CurPath+'CharConsts/Value',
                           FFigureCharConst,DefaultFigureCharConst);
-        // save standard NotFigureConstants
-        ContainsDefaults:=IsNotFigureConstantsDefault(false);
+        // save standard IgnoreFigureConstants
+        ContainsDefaults:=IgnoreFigureConstants_AreDefault(false);
        XMLConfig.SetDeleteValue(CurPath+'Ignore/ContainsDefaults',
           ContainsDefaults,true);
-        // save NotFigureConstants
+        // save IgnoreFigureConstants
        List:=CreateListOfNotFigureConstants;
        try
          for i:=List.Count-1 downto 0 do
-            if IsNotFigureConstantDefault(List[i]) then
+            if IgnoreFigureConstant_IsDefault(List[i]) then
              List.Delete(i);
          SaveStringList(XMLConfig,List,CurPath+'Ignore/');
        finally
@ -476,7 +476,7 @@ var
  s: String;
 begin
  Result:=TStringList.Create;
-  AVLNode:=NotFigureConstants.FindLowest;
+  AVLNode:=IgnoreFigureConstants.FindLowest;
  i:=0;
  while AVLNode<>nil do begin
    s:=GetAtomString(PChar(AVLNode.Data),false);
@ -484,79 +484,79 @@ begin
      inc(i);
      Result.Add(s);
    end;
-    AVLNode:=NotFigureConstants.FindSuccessor(AVLNode);
+    AVLNode:=IgnoreFigureConstants.FindSuccessor(AVLNode);
  end;
 end;

-procedure TCodeExplorerOptions.ClearNotFigureConstants;
+procedure TCodeExplorerOptions.Clear_IgnoreFigureConstants;
 var
  AVLNode: TAvgLvlTreeNode;
  s: String;
 begin
  s:='';
-  AVLNode:=FNotFigureConstants.FindLowest;
+  AVLNode:=FIgnoreFigureConstants.FindLowest;
  while AVLNode<>nil do begin
    // decrease reference counter
    Pointer(s):=AVLNode.Data;
    s:='';
-    AVLNode:=FNotFigureConstants.FindSuccessor(AVLNode);
+    AVLNode:=FIgnoreFigureConstants.FindSuccessor(AVLNode);
  end;
  if s='' then ; // omit fpc note
-  FNotFigureConstants.Clear;
+  FIgnoreFigureConstants.Clear;
 end;

-procedure TCodeExplorerOptions.SetListOfNotFigureConstants(List: TStrings;
+procedure TCodeExplorerOptions.SetListOf_IgnoreFigureConstants(List: TStrings;
  Add: boolean);
 var
  i: Integer;
 begin
  if not Add then
-    ClearNotFigureConstants;
+    Clear_IgnoreFigureConstants;
  for i:=0 to List.Count-1 do
-    AddNotFigureConstant(List[i]);
+    Add_IgnoreFigureConstant(List[i]);
 end;

-procedure TCodeExplorerOptions.LoadNotFigureConstantsToDefaults;
+procedure TCodeExplorerOptions.LoadDefaults_IgnoreFigureConstants;
 var
  i: Integer;
 begin
-  ClearNotFigureConstants;
+  Clear_IgnoreFigureConstants;
  for i:=low(DefaultNotFigureConstants) to high(DefaultNotFigureConstants) do
-    AddNotFigureConstant(DefaultNotFigureConstants[i]);
+    Add_IgnoreFigureConstant(DefaultNotFigureConstants[i]);
 end;

-function TCodeExplorerOptions.NotFigureConstant(p: PChar): boolean;
+function TCodeExplorerOptions.IgnoreFigureConstant(p: PChar): boolean;
 begin
-  Result:=FNotFigureConstants.Find(p)<>nil;
+  Result:=FIgnoreFigureConstants.Find(p)<>nil;
 end;

-procedure TCodeExplorerOptions.AddNotFigureConstant(const Atom: string);
+procedure TCodeExplorerOptions.Add_IgnoreFigureConstant(const Atom: string);
 var
  s: String;
 begin
  if Atom='' then exit;
-  if NotFigureConstant(PChar(Atom)) then exit;
+  if IgnoreFigureConstant(PChar(Atom)) then exit;
  s:=Atom;
-  FNotFigureConstants.Add(Pointer(s));
+  FIgnoreFigureConstants.Add(Pointer(s));
  Pointer(s):=nil;
 end;

-function TCodeExplorerOptions.IsNotFigureConstantsDefault(Exactly: boolean
+function TCodeExplorerOptions.IgnoreFigureConstants_AreDefault(Exactly: boolean
  ): boolean;
 const
  DefCount = high(DefaultNotFigureConstants)-Low(DefaultNotFigureConstants)+1;
 var
  i: Integer;
 begin
-  if Exactly and (FNotFigureConstants.Count=DefCount) then
+  if Exactly and (FIgnoreFigureConstants.Count=DefCount) then
    exit(false);
-  if FNotFigureConstants.Count<DefCount then exit(false);
+  if FIgnoreFigureConstants.Count<DefCount then exit(false);
  for i:=low(DefaultNotFigureConstants) to high(DefaultNotFigureConstants) do
-    if not NotFigureConstant(PChar(DefaultNotFigureConstants[i])) then exit(false);
+    if not IgnoreFigureConstant(PChar(DefaultNotFigureConstants[i])) then exit(false);
  Result:=true;
 end;

-function TCodeExplorerOptions.IsNotFigureConstantDefault(const Atom: string
+function TCodeExplorerOptions.IgnoreFigureConstant_IsDefault(const Atom: string
  ): boolean;
 var
  i: Integer;
--- a/ide/codeexplorer.pas
+++ b/ide/codeexplorer.pas
@ -1024,7 +1024,7 @@ begin
      and (not CodeExplorerOptions.FigureCharConst) then
      begin
        // ignore char constants
-      end else if CodeExplorerOptions.NotFigureConstant(@Tool.Src[Tool.CurPos.StartPos])
+      end else if CodeExplorerOptions.IgnoreFigureConstant(@Tool.Src[Tool.CurPos.StartPos])
      then begin
        // ignore user defined constants
      end else begin
--- a/ide/frames/codeexplorer_figures_options.lfm
+++ b/ide/frames/codeexplorer_figures_options.lfm
@ -1,63 +1,27 @@
 inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
  Height = 396
  Width = 478
-  ClientHeight = 396
-  ClientWidth = 478
+  ClientHeight = 392
+  ClientWidth = 474
  TabOrder = 0
  DesignLeft = 621
  DesignTop = 269
-  object LongProcLineCountLabel: TLabel[0]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = FigureCategoriesCheckGroup
-    AnchorSideTop.Side = asrBottom
-    Left = 0
-    Height = 14
-    Top = 218
-    Width = 118
-    BorderSpacing.Top = 6
-    Caption = 'LongProcLineCountLabel'
-    ParentColor = False
-  end
-  object LongParamListCountLabel: TLabel[1]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = LongProcLineCountSpinEdit
-    AnchorSideTop.Side = asrBottom
-    Left = 0
-    Height = 14
-    Top = 264
-    Width = 124
-    BorderSpacing.Top = 6
-    Caption = 'LongParamListCountLabel'
-    ParentColor = False
-  end
-  object NestedProcCountLabel: TLabel[2]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = LongParamListCountSpinEdit
-    AnchorSideTop.Side = asrBottom
-    Left = 0
-    Height = 14
-    Top = 310
-    Width = 110
-    BorderSpacing.Top = 6
-    Caption = 'NestedProcCountLabel'
-    ParentColor = False
-  end
-  object NotFigureConstantsLabel: TLabel[3]
-    AnchorSideLeft.Control = NestedProcCountLabel
+  object IgnoreFigureConstantsLabel: TLabel[0]
+    AnchorSideLeft.Control = FigureLeftPanel
    AnchorSideLeft.Side = asrBottom
    AnchorSideTop.Control = FigureCategoriesCheckGroup
    AnchorSideTop.Side = asrBottom
    AnchorSideBottom.Control = FigureCharConstCheckBox
-    Left = 210
-    Height = 14
-    Top = 218
-    Width = 122
-    BorderSpacing.Left = 100
+    Left = 202
+    Height = 18
+    Top = 56
+    Width = 178
+    BorderSpacing.Left = 10
    BorderSpacing.Top = 6
-    Caption = 'NotFigureConstantsLabel'
+    Caption = 'IgnoreFigureConstantsLabel'
    ParentColor = False
  end
-  object FigureCategoriesCheckGroup: TCheckGroup[4]
+  object FigureCategoriesCheckGroup: TCheckGroup[1]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
    AnchorSideRight.Control = Owner
@ -65,9 +29,9 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
    Left = 0
-    Height = 212
+    Height = 50
    Top = 0
-    Width = 478
+    Width = 474
    Anchors = [akTop, akLeft, akRight]
    AutoFill = True
    AutoSize = True
@ -80,71 +44,124 @@ inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
    ChildSizing.ShrinkVertical = crsScaleChilds
    ChildSizing.Layout = cclLeftToRightThenTopToBottom
    ChildSizing.ControlsPerLine = 1
+    Constraints.MinHeight = 50
    TabOrder = 0
  end
-  object NestedProcCountSpinEdit: TSpinEdit[5]
-    AnchorSideLeft.Control = LongProcLineCountSpinEdit
-    AnchorSideTop.Control = NestedProcCountLabel
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 23
-    Top = 327
-    Width = 60
-    BorderSpacing.Top = 3
-    TabOrder = 1
-  end
-  object LongProcLineCountSpinEdit: TSpinEdit[6]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = LongProcLineCountLabel
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 23
-    Top = 235
-    Width = 60
-    BorderSpacing.Left = 6
-    BorderSpacing.Top = 3
-    TabOrder = 2
-  end
-  object LongParamListCountSpinEdit: TSpinEdit[7]
-    AnchorSideLeft.Control = LongProcLineCountSpinEdit
-    AnchorSideTop.Control = LongParamListCountLabel
-    AnchorSideTop.Side = asrBottom
-    Left = 6
-    Height = 23
-    Top = 281
-    Width = 60
-    BorderSpacing.Top = 3
-    TabOrder = 3
-  end
-  object FigureCharConstCheckBox: TCheckBox[8]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = NestedProcCountSpinEdit
-    AnchorSideTop.Side = asrBottom
-    Left = 0
-    Height = 17
-    Top = 356
-    Width = 145
-    BorderSpacing.Top = 6
-    Caption = 'FigureCharConstCheckBox'
-    TabOrder = 4
-  end
-  object NotFigureConstantsMemo: TMemo[9]
-    AnchorSideLeft.Control = NotFigureConstantsLabel
-    AnchorSideTop.Control = NotFigureConstantsLabel
+  object IgnoreFigureConstantsMemo: TMemo[2]
+    AnchorSideLeft.Control = IgnoreFigureConstantsLabel
+    AnchorSideTop.Control = IgnoreFigureConstantsLabel
    AnchorSideTop.Side = asrBottom
    AnchorSideRight.Control = Owner
    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = FigureCharConstCheckBox
+    AnchorSideBottom.Control = Owner
    AnchorSideBottom.Side = asrBottom
-    Left = 210
-    Height = 138
-    Top = 235
-    Width = 268
+    Left = 202
+    Height = 315
+    Top = 77
+    Width = 272
    Anchors = [akTop, akLeft, akRight, akBottom]
    BorderSpacing.Top = 3
    Lines.Strings = (
-      'NotFigureConstantsMemo'
+      'IgnoreFigureConstantsMemo'
    )
-    TabOrder = 5
+    TabOrder = 1
+  end
+  object FigureLeftPanel: TPanel[3]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = FigureCategoriesCheckGroup
+    AnchorSideTop.Side = asrBottom
+    Left = 0
+    Height = 178
+    Top = 56
+    Width = 192
+    AutoSize = True
+    BorderSpacing.Top = 6
+    BevelOuter = bvNone
+    ClientHeight = 178
+    ClientWidth = 192
+    TabOrder = 2
+    object NestedProcCountLabel: TLabel
+      AnchorSideLeft.Control = FigureLeftPanel
+      AnchorSideTop.Control = LongParamListCountSpinEdit
+      AnchorSideTop.Side = asrBottom
+      Left = 0
+      Height = 18
+      Top = 106
+      Width = 147
+      BorderSpacing.Top = 6
+      Caption = 'NestedProcCountLabel'
+      ParentColor = False
+    end
+    object LongParamListCountLabel: TLabel
+      AnchorSideLeft.Control = FigureLeftPanel
+      AnchorSideTop.Control = LongProcLineCountSpinEdit
+      AnchorSideTop.Side = asrBottom
+      Left = 0
+      Height = 18
+      Top = 56
+      Width = 167
+      BorderSpacing.Top = 6
+      Caption = 'LongParamListCountLabel'
+      ParentColor = False
+    end
+    object LongProcLineCountLabel: TLabel
+      AnchorSideLeft.Control = FigureLeftPanel
+      AnchorSideTop.Control = FigureLeftPanel
+      Left = 0
+      Height = 18
+      Top = 6
+      Width = 158
+      BorderSpacing.Top = 6
+      Caption = 'LongProcLineCountLabel'
+      ParentColor = False
+    end
+    object FigureCharConstCheckBox: TCheckBox
+      AnchorSideLeft.Control = FigureLeftPanel
+      AnchorSideTop.Control = NestedProcCountSpinEdit
+      AnchorSideTop.Side = asrBottom
+      Left = 0
+      Height = 22
+      Top = 156
+      Width = 192
+      BorderSpacing.Top = 6
+      Caption = 'FigureCharConstCheckBox'
+      TabOrder = 0
+    end
+    object NestedProcCountSpinEdit: TSpinEdit
+      AnchorSideLeft.Control = FigureCharConstCheckBox
+      AnchorSideTop.Control = NestedProcCountLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 23
+      Top = 127
+      Width = 60
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 3
+      TabOrder = 1
+    end
+    object LongParamListCountSpinEdit: TSpinEdit
+      AnchorSideLeft.Control = FigureLeftPanel
+      AnchorSideTop.Control = LongParamListCountLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 23
+      Top = 77
+      Width = 60
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 3
+      TabOrder = 2
+    end
+    object LongProcLineCountSpinEdit: TSpinEdit
+      AnchorSideLeft.Control = FigureLeftPanel
+      AnchorSideTop.Control = LongProcLineCountLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 23
+      Top = 27
+      Width = 60
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 3
+      TabOrder = 3
+    end
  end
 end
--- a/ide/frames/codeexplorer_figures_options.lrs
+++ b/ide/frames/codeexplorer_figures_options.lrs
@ -2,62 +2,67 @@

 LazarusResources.Add('TCodeExplorerFiguresOptionsFrame','FORMDATA',[
  'TPF0'#241' TCodeExplorerFiguresOptionsFrame'#31'CodeExplorerFiguresOptionsFr'
-  +'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'm'#2#9'DesignTop'#3#13#1#0
-  +#242#2#0#6'TLabel'#22'LongProcLineCountLabel'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#26'FigureCategoriesCheckGroup'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#218#0#5'Wi'
-  +'dth'#2'v'#17'BorderSpacing.Top'#2#6#7'Caption'#6#22'LongProcLineCountLabel'
-  +#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#23'LongParamListCountLabel'#22'Anch'
-  +'orSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#25'LongProcLineC'
+  +'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
+  +#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
+  +#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
-  +#14#3'Top'#3#8#1#5'Width'#2'|'#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'Lon'
-  +'gParamListCountLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#20'NestedProc'
-  +'CountLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#26'LongParamListCountSpinEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#2#0#6'Height'#2#14#3'Top'#3'6'#1#5'Width'#2'n'#17'BorderSpacing.Top'#2#6
-  +#7'Caption'#6#20'NestedProcCountLabel'#11'ParentColor'#8#0#0#242#2#3#6'TLabe'
-  +'l'#23'NotFigureConstantsLabel'#22'AnchorSideLeft.Control'#7#20'NestedProcCo'
-  +'untLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#26'FigureCategoriesCheckGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'Anc'
-  +'horSideBottom.Control'#7#23'FigureCharConstCheckBox'#4'Left'#3#210#0#6'Heig'
-  +'ht'#2#14#3'Top'#3#218#0#5'Width'#2'z'#18'BorderSpacing.Left'#2'd'#17'Border'
-  +'Spacing.Top'#2#6#7'Caption'#6#23'NotFigureConstantsLabel'#11'ParentColor'#8
-  +#0#0#242#2#4#11'TCheckGroup'#26'FigureCategoriesCheckGroup'#22'AnchorSideLef'
-  +'t.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRig'
-  +'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
-  +'eBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
-  +#2#0#6'Height'#3#212#0#3'Top'#2#0#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'AutoFill'#9#8'AutoSize'#9#7'Caption'#6#26'FigureCate'
-  +'goriesCheckGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBo'
-  +'ttomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildR'
-  +'esize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Ch'
-  +'ildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVerti'
-  +'cal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTop'
-  +'ToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#242#2#5#9
-  +'TSpinEdit'#23'NestedProcCountSpinEdit'#22'AnchorSideLeft.Control'#7#25'Long'
-  +'ProcLineCountSpinEdit'#21'AnchorSideTop.Control'#7#20'NestedProcCountLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3'G'
-  +#1#5'Width'#2'<'#17'BorderSpacing.Top'#2#3#8'TabOrder'#2#1#0#0#242#2#6#9'TSp'
-  +'inEdit'#25'LongProcLineCountSpinEdit'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#22'LongProcLineCountLabel'#18'AnchorSideTop.Sid'
-  +'e'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#235#0#5'Width'#2'<'#18
-  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#8'TabOrder'#2#2#0#0#242#2
-  +#7#9'TSpinEdit'#26'LongParamListCountSpinEdit'#22'AnchorSideLeft.Control'#7
-  +#25'LongProcLineCountSpinEdit'#21'AnchorSideTop.Control'#7#23'LongParamListC'
-  +'ountLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23
-  +#3'Top'#3#25#1#5'Width'#2'<'#17'BorderSpacing.Top'#2#3#8'TabOrder'#2#3#0#0
-  +#242#2#8#9'TCheckBox'#23'FigureCharConstCheckBox'#22'AnchorSideLeft.Control'
-  +#7#5'Owner'#21'AnchorSideTop.Control'#7#23'NestedProcCountSpinEdit'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#17#3'Top'#3'd'#1#5'Wi'
-  +'dth'#3#145#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'FigureCharConstCheck'
-  +'Box'#8'TabOrder'#2#4#0#0#242#2#9#5'TMemo'#22'NotFigureConstantsMemo'#22'Anc'
-  +'horSideLeft.Control'#7#23'NotFigureConstantsLabel'#21'AnchorSideTop.Control'
-  +#7#23'NotFigureConstantsLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
-  +'orSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#23'FigureCharConstCheckBox'#21'AnchorSideBottom'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#210#0#6'Height'#3#138#0#3'Top'#3#235#0#5'Wi'
-  +'dth'#3#12#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'Bo'
-  +'rderSpacing.Top'#2#3#13'Lines.Strings'#1#6#22'NotFigureConstantsMemo'#0#8'T'
-  +'abOrder'#2#5#0#0#0
+  +#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
 ]);
--- a/ide/frames/codeexplorer_figures_options.pas
+++ b/ide/frames/codeexplorer_figures_options.pas
@ -35,14 +35,15 @@ type
  TCodeExplorerFiguresOptionsFrame = class(TAbstractIDEOptionsEditor)
    FigureCharConstCheckBox: TCheckBox;
    FigureCategoriesCheckGroup: TCheckGroup;
-    NotFigureConstantsLabel: TLabel;
+    IgnoreFigureConstantsLabel: TLabel;
    LongProcLineCountLabel: TLabel;
    LongParamListCountLabel: TLabel;
-    NotFigureConstantsMemo: TMemo;
+    IgnoreFigureConstantsMemo: TMemo;
    NestedProcCountLabel: TLabel;
    LongProcLineCountSpinEdit: TSpinEdit;
    LongParamListCountSpinEdit: TSpinEdit;
    NestedProcCountSpinEdit: TSpinEdit;
+    FigureLeftPanel: TPanel;
  public
    function GetTitle: String; override;
    procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@ -73,7 +74,7 @@ begin
  LongParamListCountLabel.Caption := lisCELongParamListCount;
  NestedProcCountLabel.Caption := lisCENestedProcCount;
  FigureCharConstCheckBox.Caption := lisCEFigureCharConst;
-  NotFigureConstantsLabel.Caption := lisCENotFigureConstants;
+  IgnoreFigureConstantsLabel.Caption := lisCENotFigureConstants;
 end;

 procedure TCodeExplorerFiguresOptionsFrame.ReadSettings(
@ -92,7 +93,7 @@ begin
    NestedProcCountSpinEdit.Value := NestedProcCount;
    FigureCharConstCheckBox.Checked := FigureCharConst;
    Tmp := CreateListOfNotFigureConstants;
-    NotFigureConstantsMemo.Lines.Assign(Tmp);
+    IgnoreFigureConstantsMemo.Lines.Assign(Tmp);
    Tmp.Free;
  end;
 end;
@ -114,7 +115,7 @@ begin
    LongParamListCount := LongParamListCountSpinEdit.Value;
    NestedProcCount := NestedProcCountSpinEdit.Value;
    FigureCharConst := FigureCharConstCheckBox.Checked;
-    SetListOfNotFigureConstants(NotFigureConstantsMemo.Lines,false);
+    SetListOf_IgnoreFigureConstants(IgnoreFigureConstantsMemo.Lines,false);
  end;
 end;