ide: more code explorer figures options

git-svn-id: trunk@19484 -

ide/frames/codeexplorer_categories_options.lrs

@@ -1,5 +1,3 @@
-{ This is an automatically generated lazarus resource file }
-
 LazarusResources.Add('TCodeExplorerCategoriesOptionsFrame','FORMDATA',[
   'TPF0'#241'#TCodeExplorerCategoriesOptionsFrame"CodeExplorerCategoriesOptions'
   +'Frame'#6'Height'#3','#1#5'Width'#3#144#1#12'ClientHeight'#3','#1#11'ClientW'

ide/frames/codeexplorer_figures_options.lfm

@@ -1,14 +1,48 @@
-object CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
-  Left = 0
-  Height = 300
-  Top = 0
-  Width = 400
-  ClientHeight = 300
-  ClientWidth = 400
+inherited CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
+  Height = 376
+  Width = 478
+  ClientHeight = 376
+  ClientWidth = 478
   TabOrder = 0
-  DesignLeft = 744
-  DesignTop = 181
-  object FigureCategoriesCheckGroup: TCheckGroup
+  DesignLeft = 476
+  DesignTop = 97
+  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 FigureCategoriesCheckGroup: TCheckGroup[3]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
@@ -16,11 +50,12 @@ object CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 300
+    Height = 212
     Top = 0
-    Width = 400
-    Anchors = [akTop, akLeft, akRight, akBottom]
+    Width = 478
+    Anchors = [akTop, akLeft, akRight]
     AutoFill = True
+    AutoSize = True
     Caption = 'FigureCategoriesCheckGroup'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -32,4 +67,38 @@ object CodeExplorerFiguresOptionsFrame: TCodeExplorerFiguresOptionsFrame
     ChildSizing.ControlsPerLine = 1
     TabOrder = 0
   end
+  object NestedProcCountSpinEdit: TSpinEdit[4]
+    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[5]
+    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[6]
+    AnchorSideLeft.Control = LongProcLineCountSpinEdit
+    AnchorSideTop.Control = LongParamListCountLabel
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 23
+    Top = 281
+    Width = 60
+    BorderSpacing.Top = 3
+    TabOrder = 3
+  end
 end

ide/frames/codeexplorer_figures_options.lrs

@@ -1,19 +1,44 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TCodeExplorerFiguresOptionsFrame','FORMDATA',[
-  'TPF0 TCodeExplorerFiguresOptionsFrame'#31'CodeExplorerFiguresOptionsFrame'#4
-  +'Left'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'#3#144#1#12'ClientHeight'#3','
-  +#1#11'ClientWidth'#3#144#1#8'TabOrder'#2#0#10'DesignLeft'#3#232#2#9'DesignTo'
-  +'p'#3#181#0#0#11'TCheckGroup'#26'FigureCategoriesCheckGroup'#22'AnchorSideLe'
-  +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRi'
-  +'ght.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSi'
-  +'deBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2#0#6'Height'#3','#1#3'Top'#2#0#5'Width'#3#144#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#7'Caption'#6#26'FigureCatego'
-  +'riesCheckGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBott'
-  +'omSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildRes'
-  +'ize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Chil'
-  +'dSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertica'
-  +'l'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopTo'
-  +'Bottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#0
+  'TPF0'#241' TCodeExplorerFiguresOptionsFrame'#31'CodeExplorerFiguresOptionsFr'
+  +'ame'#6'Height'#3'x'#1#5'Width'#3#222#1#12'ClientHeight'#3'x'#1#11'ClientWid'
+  +'th'#3#222#1#8'TabOrder'#2#0#10'DesignLeft'#3#220#1#9'DesignTop'#2'a'#0#242#2
+  +#0#6'TLabel'#22'LongProcLineCountLabel'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#26'FigureCategoriesCheckGroup'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#218#0#5'Width'#2
+  +'v'#17'BorderSpacing.Top'#2#6#7'Caption'#6#22'LongProcLineCountLabel'#11'Par'
+  +'entColor'#8#0#0#242#2#1#6'TLabel'#23'LongParamListCountLabel'#22'AnchorSide'
+  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#25'LongProcLineCountSp'
+  +'inEdit'#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'LongPara'
+  +'mListCountLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#20'NestedProcCount'
+  +'Label'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#26
+  +'LongParamListCountSpinEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#0#6'Height'#2#14#3'Top'#3'6'#1#5'Width'#2'n'#17'BorderSpacing.Top'#2#6#7'Ca'
+  +'ption'#6#20'NestedProcCountLabel'#11'ParentColor'#8#0#0#242#2#3#11'TCheckGr'
+  +'oup'#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'asrBottom'#4'Left'#2#0#6'Height'#3#212#0#3'To'
+  +'p'#2#0#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Aut'
+  +'oFill'#9#8'AutoSize'#9#7'Caption'#6#26'FigureCategoriesCheckGroup'#28'Child'
+  +'Sizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildS'
+  +'izing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enla'
+  +'rgeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'
+  +#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18
+  +'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Cont'
+  +'rolsPerLine'#2#1#8'TabOrder'#2#0#0#0#242#2#4#9'TSpinEdit'#23'NestedProcCoun'
+  +'tSpinEdit'#22'AnchorSideLeft.Control'#7#25'LongProcLineCountSpinEdit'#21'An'
+  +'chorSideTop.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'Border'
+  +'Spacing.Top'#2#3#8'TabOrder'#2#1#0#0#242#2#5#9'TSpinEdit'#25'LongProcLineCo'
+  +'untSpinEdit'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#22'LongProcLineCountLabel'#18'AnchorSideTop.Side'#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#6#9'TSpinEdit'#26'LongPara'
+  +'mListCountSpinEdit'#22'AnchorSideLeft.Control'#7#25'LongProcLineCountSpinEd'
+  +'it'#21'AnchorSideTop.Control'#7#23'LongParamListCountLabel'#18'AnchorSideTo'
+  +'p.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#0
 ]);

ide/frames/codeexplorer_figures_options.pas

@@ -26,7 +26,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, LResources, Forms,
-  IDEOptionsIntf, LazarusIDEStrConsts, CodeExplOpts, ExtCtrls;
+  IDEOptionsIntf, LazarusIDEStrConsts, CodeExplOpts, ExtCtrls, Spin, StdCtrls;
 
 type
 
@@ -34,6 +34,12 @@ type
 
   TCodeExplorerFiguresOptionsFrame = class(TAbstractIDEOptionsEditor)
     FigureCategoriesCheckGroup: TCheckGroup;
+    LongProcLineCountLabel: TLabel;
+    LongParamListCountLabel: TLabel;
+    NestedProcCountLabel: TLabel;
+    LongProcLineCountSpinEdit: TSpinEdit;
+    LongParamListCountSpinEdit: TSpinEdit;
+    NestedProcCountSpinEdit: TSpinEdit;
   public
     function GetTitle: String; override;
     procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
@@ -59,6 +65,10 @@ begin
   FigureCategoriesCheckGroup.Caption := lisCEShowFigures;
   for c := Low(TCEFigureCategory) to High(TCEFigureCategory) do
     FigureCategoriesCheckGroup.Items.Add(CodeExplorerLocalizedString(c));
+
+  LongProcLineCountLabel.Caption := lisCELongProcLineCount;
+  LongParamListCountLabel.Caption := lisCELongParamListCount;
+  NestedProcCountLabel.Caption := lisCENestedProcCount;
 end;
 
 procedure TCodeExplorerFiguresOptionsFrame.ReadSettings(
@@ -67,8 +77,14 @@ var
   c: TCEFigureCategory;
 begin
   with AOptions as TCodeExplorerOptions do
+  begin
     for c := Low(TCEFigureCategory) to High(TCEFigureCategory) do
       FigureCategoriesCheckGroup.Checked[ord(c)] := c in Figures;
+
+    LongProcLineCountSpinEdit.Value := LongProcLineCount;
+    LongParamListCountSpinEdit.Value := LongParamListCount;
+    NestedProcCountSpinEdit.Value := NestedProcCount;
+  end;
 end;
 
 procedure TCodeExplorerFiguresOptionsFrame.WriteSettings(
@@ -82,7 +98,12 @@ begin
     if FigureCategoriesCheckGroup.Checked[ord(c)] then
       Include(NewCategories, c);
   with AOptions as TCodeExplorerOptions do
+  begin
     Figures := NewCategories;
+    LongProcLineCount := LongProcLineCountSpinEdit.Value;
+    LongParamListCount := LongParamListCountSpinEdit.Value;
+    NestedProcCount := NestedProcCountSpinEdit.Value;
+  end;
 end;
 
 class function TCodeExplorerFiguresOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;

ide/lazarusidestrconsts.pas

@@ -4140,6 +4140,9 @@ resourcestring
   lisCEUnsortedMembers = 'Unsorted members';
   lisCEToDos = 'ToDos';
   lisCEEmptyClassSections = 'Empty class sections';
+  lisCELongProcLineCount = 'Line count to treat procedure as "long"';
+  lisCELongParamListCount = 'Parameters count to treat then as "many"';
+  lisCENestedProcCount = 'Nested procedures count to tream them as "many"';
 
 implementation