IDE: codetools class options: changed radiogroups to comboboxes and added hints

git-svn-id: trunk@53165 -
2025-04-19 10:49:44 +02:00 · 2016-10-19 21:27:12 +00:00 · 2016-10-19 21:27:12 +00:00 · db0e2f90e3
commit db0e2f90e3
parent 5a9b494484
3 changed files with 106 additions and 89 deletions
--- a/ide/frames/codetools_classcompletion_options.lfm
+++ b/ide/frames/codetools_classcompletion_options.lfm
@ -9,66 +9,17 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
  Visible = False
  DesignLeft = 336
  DesignTop = 176
-  object ClassPartInsertPolicyRadioGroup: TRadioGroup
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 0
-    Height = 100
-    Top = 0
-    Width = 250
-    AutoFill = True
-    AutoSize = True
-    Caption = 'ClassPartInsertPolicyRadioGroup'
-    ChildSizing.LeftRightSpacing = 6
-    ChildSizing.TopBottomSpacing = 6
-    ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
-    ChildSizing.EnlargeVertical = crsHomogenousChildResize
-    ChildSizing.ShrinkHorizontal = crsScaleChilds
-    ChildSizing.ShrinkVertical = crsScaleChilds
-    ChildSizing.Layout = cclLeftToRightThenTopToBottom
-    ChildSizing.ControlsPerLine = 1
-    Constraints.MinHeight = 100
-    Constraints.MinWidth = 250
-    TabOrder = 0
-  end
-  object MethodInsertPolicyRadioGroup: TRadioGroup
-    AnchorSideLeft.Control = ClassPartInsertPolicyRadioGroup
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = Owner
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 256
-    Height = 100
-    Top = 0
-    Width = 319
-    Anchors = [akTop, akLeft, akRight]
-    AutoFill = True
-    AutoSize = True
-    BorderSpacing.Left = 6
-    Caption = 'MethodInsertPolicyRadioGroup'
-    ChildSizing.LeftRightSpacing = 6
-    ChildSizing.TopBottomSpacing = 6
-    ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
-    ChildSizing.EnlargeVertical = crsHomogenousChildResize
-    ChildSizing.ShrinkHorizontal = crsScaleChilds
-    ChildSizing.ShrinkVertical = crsScaleChilds
-    ChildSizing.Layout = cclLeftToRightThenTopToBottom
-    ChildSizing.ControlsPerLine = 1
-    Constraints.MinHeight = 100
-    TabOrder = 1
-  end
  object MixMethodsAndPropertiesCheckBox: TCheckBox
    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = ClassPartInsertPolicyRadioGroup
+    AnchorSideTop.Control = InsertPoliciesPanel
    AnchorSideTop.Side = asrBottom
    Left = 6
    Height = 24
-    Top = 106
+    Top = 72
    Width = 227
-    BorderSpacing.Around = 6
+    BorderSpacing.Left = 6
    Caption = 'MixMethodsAndPropertiesCheckBox'
-    TabOrder = 2
+    TabOrder = 0
  end
  object ClassHeaderCommentsCheckBox: TCheckBox
    AnchorSideLeft.Control = Owner
@ -76,11 +27,11 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
    AnchorSideTop.Side = asrBottom
    Left = 6
    Height = 24
-    Top = 166
+    Top = 132
    Width = 204
    BorderSpacing.Around = 6
    Caption = 'ClassHeaderCommentsCheckBox'
-    TabOrder = 4
+    TabOrder = 2
  end
  object PropertyCompletionGroupBox: TGroupBox
    AnchorSideLeft.Control = Owner
@ -91,7 +42,7 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
    AnchorSideBottom.Side = asrBottom
    Left = 0
    Height = 172
-    Top = 226
+    Top = 192
    Width = 575
    Anchors = [akTop, akLeft, akRight]
    AutoSize = True
@ -99,7 +50,7 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
    Caption = 'PropertyCompletionGroupBox'
    ClientHeight = 157
    ClientWidth = 571
-    TabOrder = 6
+    TabOrder = 4
    object PropertyCompletionCheckBox: TCheckBox
      AnchorSideLeft.Control = PropertyCompletionGroupBox
      AnchorSideTop.Control = PropertyCompletionGroupBox
@ -267,11 +218,11 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
    AnchorSideTop.Side = asrBottom
    Left = 6
    Height = 24
-    Top = 196
+    Top = 162
    Width = 251
    BorderSpacing.Around = 6
    Caption = 'ClassImplementationCommentsCheckBox'
-    TabOrder = 5
+    TabOrder = 3
  end
  object UpdateAllMethodSignaturesCheckBox: TCheckBox
    AnchorSideLeft.Control = Owner
@ -279,10 +230,72 @@ object CodetoolsClassCompletionOptionsFrame: TCodetoolsClassCompletionOptionsFra
    AnchorSideTop.Side = asrBottom
    Left = 6
    Height = 24
-    Top = 136
+    Top = 102
    Width = 235
    BorderSpacing.Around = 6
    Caption = 'UpdateAllMethodSignaturesCheckBox'
-    TabOrder = 3
+    TabOrder = 1
+  end
+  object InsertPoliciesPanel: TPanel
+    Left = 0
+    Height = 72
+    Top = 0
+    Width = 575
+    Align = alTop
+    AutoSize = True
+    BevelOuter = bvNone
+    ChildSizing.LeftRightSpacing = 6
+    ChildSizing.TopBottomSpacing = 6
+    ChildSizing.HorizontalSpacing = 6
+    ChildSizing.VerticalSpacing = 6
+    ChildSizing.Layout = cclLeftToRightThenTopToBottom
+    ChildSizing.ControlsPerLine = 2
+    ClientHeight = 72
+    ClientWidth = 575
+    TabOrder = 5
+    object ClassPartInsertPolicyLabel: TLabel
+      Left = 6
+      Height = 13
+      Top = 13
+      Width = 142
+      BorderSpacing.CellAlignVertical = ccaCenter
+      Caption = 'ClassPartInsertPolicyLabel'
+      ParentColor = False
+      ParentShowHint = False
+      ShowHint = True
+    end
+    object ClassPartInsertPolicyComboBox: TComboBox
+      Left = 154
+      Height = 27
+      Top = 6
+      Width = 100
+      ItemHeight = 0
+      ParentShowHint = False
+      ShowHint = True
+      Style = csDropDownList
+      TabOrder = 0
+    end
+    object MethodInsertPolicyLabel: TLabel
+      Left = 6
+      Height = 13
+      Top = 46
+      Width = 142
+      BorderSpacing.CellAlignVertical = ccaCenter
+      Caption = 'MethodInsertPolicyLabel'
+      ParentColor = False
+      ParentShowHint = False
+      ShowHint = True
+    end
+    object MethodInsertPolicyComboBox: TComboBox
+      Left = 154
+      Height = 27
+      Top = 39
+      Width = 100
+      ItemHeight = 0
+      ParentShowHint = False
+      ShowHint = True
+      Style = csDropDownList
+      TabOrder = 1
+    end
  end
 end
--- a/ide/frames/codetools_classcompletion_options.pas
+++ b/ide/frames/codetools_classcompletion_options.pas
@ -33,12 +33,15 @@ type
  { TCodetoolsClassCompletionOptionsFrame }

  TCodetoolsClassCompletionOptionsFrame = class(TAbstractIDEOptionsEditor)
+    ClassPartInsertPolicyComboBox: TComboBox;
+    ClassPartInsertPolicyLabel: TLabel;
+    InsertPoliciesPanel: TPanel;
+    MethodInsertPolicyComboBox: TComboBox;
+    MethodInsertPolicyLabel: TLabel;
    SetPropertyVariableIsPrefixCheckBox: TCheckBox;
    SetPropertyVariableUseConstCheckBox: TCheckBox;
    ClassHeaderCommentsCheckBox: TCheckBox;
    ClassImplementationCommentsCheckBox: TCheckBox;
-    ClassPartInsertPolicyRadioGroup: TRadioGroup;
-    MethodInsertPolicyRadioGroup: TRadioGroup;
    MixMethodsAndPropertiesCheckBox: TCheckBox;
    PropPrefixesPanel: TPanel;
    PrivateVariablePrefixEdit: TEdit;
@ -77,26 +80,22 @@ end;
 procedure TCodetoolsClassCompletionOptionsFrame.Setup(
  ADialog: TAbstractOptionsEditorDialog);
 begin
-  with ClassPartInsertPolicyRadioGroup do begin
-    Caption:=dlgInsertClassParts;
-    with Items do begin
-      BeginUpdate;
-      Add(dlgAlphabetically);
-      Add(dlgCDTLast);
-      EndUpdate;
-    end;
-  end;
+  ClassPartInsertPolicyLabel.Caption:=dlgInsertClassParts;
+  ClassPartInsertPolicyLabel.Hint:=
+    lisNewMethodsAndMembersAreInsertedAlphabeticallyOrAdd;
+  ClassPartInsertPolicyComboBox.Hint:=ClassPartInsertPolicyLabel.Hint;
+  ClassPartInsertPolicyComboBox.Items.Text:=
+    dlgAlphabetically+LineEnding+
+    dlgCDTLast;

-  with MethodInsertPolicyRadioGroup do begin
-    Caption:=dlgInsertMethods;
-    with Items do begin
-      BeginUpdate;
-      Add(dlgAlphabetically);
-      Add(dlgCDTLast);
-      Add(dlgCDTClassOrder);
-      EndUpdate;
-    end;
-  end;
+  MethodInsertPolicyLabel.Caption:=dlgInsertMethods;
+  MethodInsertPolicyLabel.Hint:=
+    lisNewMethodImplementationsAreInsertedBetweenExisting;
+  MethodInsertPolicyComboBox.Hint:=MethodInsertPolicyLabel.Hint;
+  MethodInsertPolicyComboBox.Items.Text:=
+    dlgAlphabetically+LineEnding+
+    dlgCDTLast+LineEnding+
+    dlgCDTClassOrder;

  MixMethodsAndPropertiesCheckBox.Caption:=dlgMixMethodsAndProperties;
  UpdateAllMethodSignaturesCheckBox.Caption:=lisCTOUpdateAllMethodSignatures;
@ -125,10 +124,10 @@ begin
  begin
    case ClassPartInsertPolicy of
      cpipAlphabetically:
-        ClassPartInsertPolicyRadioGroup.ItemIndex:=0;
+        ClassPartInsertPolicyComboBox.ItemIndex:=0;
    else
      // cpipLast
-      ClassPartInsertPolicyRadioGroup.ItemIndex:=1;
+      ClassPartInsertPolicyComboBox.ItemIndex:=1;
    end;

    MixMethodsAndPropertiesCheckBox.Checked := MixMethodsAndProperties;
@ -137,12 +136,12 @@ begin
    ClassImplementationCommentsCheckBox.Checked := ClassImplementationComments;
    case MethodInsertPolicy of
      mipAlphabetically:
-        MethodInsertPolicyRadioGroup.ItemIndex:=0;
+        MethodInsertPolicyComboBox.ItemIndex:=0;
      mipLast:
-        MethodInsertPolicyRadioGroup.ItemIndex:=1;
+        MethodInsertPolicyComboBox.ItemIndex:=1;
    else
      // mipClassOrder
-      MethodInsertPolicyRadioGroup.ItemIndex:=2;
+      MethodInsertPolicyComboBox.ItemIndex:=2;
    end;

    PropertyCompletionCheckBox.Checked := CompleteProperties;
@ -161,7 +160,7 @@ procedure TCodetoolsClassCompletionOptionsFrame.WriteSettings(
 begin
  with AOptions as TCodetoolsOptions do
  begin
-    case ClassPartInsertPolicyRadioGroup.ItemIndex of
+    case ClassPartInsertPolicyComboBox.ItemIndex of
      0: ClassPartInsertPolicy := cpipAlphabetically;
      1: ClassPartInsertPolicy := cpipLast;
    end;
@ -171,7 +170,7 @@ begin
    ClassHeaderComments := ClassHeaderCommentsCheckBox.Checked;
    ClassImplementationComments := ClassImplementationCommentsCheckBox.Checked;

-    case MethodInsertPolicyRadioGroup.ItemIndex of
+    case MethodInsertPolicyComboBox.ItemIndex of
      0: MethodInsertPolicy := mipAlphabetically;
      1: MethodInsertPolicy := mipLast;
      2: MethodInsertPolicy := mipClassOrder;
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@ -2126,6 +2126,8 @@ resourcestring
  dlgSkipForwardClassDeclarations = 'Skip forward class declarations';
  dlgJumpToMethodBody = 'Jump directly to method body';
  dlgInsertClassParts = 'Insert class parts';
+  lisNewMethodsAndMembersAreInsertedAlphabeticallyOrAdd = 'New method and '
+    +'member declarations in the class..end sections are inserted alphabetically or added last';
  lisClassCompletion = 'Class Completion';
  dlgAlphabetically = 'Alphabetically';
  dlgCDTLast = 'Last';
@ -2140,6 +2142,9 @@ resourcestring
  lisInFrontOfRelated = 'In front of related';
  lisBehindRelated = 'Behind related';
  dlgInsertMethods = 'Insert methods';
+  lisNewMethodImplementationsAreInsertedBetweenExisting = 'New method '
+    +'implementations are inserted between existing methods of this class. '
+    +'Either alphabetically, or as last, or in declaration order.';
  dlgCDTClassOrder = 'Class order';
  dlgKeywordPolicy = 'Keyword policy';
  dlgCDTLower = 'lowercase';