From 2ef8c46a2f614511a1c068228603e5d1a5678dc6 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 19 Jan 2015 10:44:28 +0000 Subject: [PATCH] IDE: options: identifier completion: dividers for groups git-svn-id: branches/fixes_1_4@47422 - --- ...codetools_identifiercompletion_options.lfm | 149 +++++++++++------- ...codetools_identifiercompletion_options.pas | 26 +-- ide/lazarusidestrconsts.pas | 1 + 3 files changed, 113 insertions(+), 63 deletions(-) diff --git a/ide/frames/codetools_identifiercompletion_options.lfm b/ide/frames/codetools_identifiercompletion_options.lfm index d0c10cae4d..3892c0481b 100644 --- a/ide/frames/codetools_identifiercompletion_options.lfm +++ b/ide/frames/codetools_identifiercompletion_options.lfm @@ -11,14 +11,13 @@ object CodetoolsIndentifierCompletionOptionsFrame: TCodetoolsIndentifierCompleti DesignTop = 178 object ICAddSemicolonCheckBox: TCheckBox AnchorSideLeft.Control = Owner - AnchorSideTop.Control = Owner - AnchorSideRight.Control = Owner + AnchorSideTop.Control = ICAddDividerBevel + AnchorSideTop.Side = asrBottom AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 0 - Width = 537 - Anchors = [akTop, akLeft, akRight] + Height = 24 + Top = 90 + Width = 168 Caption = 'ICAddSemicolonCheckBox' TabOrder = 0 end @@ -26,59 +25,47 @@ object CodetoolsIndentifierCompletionOptionsFrame: TCodetoolsIndentifierCompleti AnchorSideLeft.Control = Owner AnchorSideTop.Control = ICAddSemicolonCheckBox AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 23 - Width = 537 - Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 6 + Height = 24 + Top = 114 + Width = 198 Caption = 'ICAddAssignOperatorCheckBox' TabOrder = 1 end object ICAutoStartAfterPointCheckBox: TCheckBox AnchorSideLeft.Control = Owner - AnchorSideTop.Control = ICAddDoCheckBox + AnchorSideTop.Control = ICOpenDividerBevel AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 69 - Width = 537 - Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 6 + Height = 24 + Top = 25 + Width = 203 Caption = 'ICAutoStartAfterPointCheckBox' TabOrder = 2 end object ICAutoAddParameterBracketsCheckBox: TCheckBox AnchorSideLeft.Control = Owner - AnchorSideTop.Control = ICAutoStartAfterPointCheckBox + AnchorSideTop.Control = ICAddDoCheckBox AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 92 - Width = 537 - Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 6 + Height = 24 + Top = 162 + Width = 245 Caption = 'ICAutoAddParameterBracketsCheckBox' TabOrder = 3 end object ICShowHelpCheckBox: TCheckBox AnchorSideLeft.Control = Owner - AnchorSideTop.Control = ICReplaceCheckBox + AnchorSideTop.Control = ICAutoStartAfterPointCheckBox AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 146 - Width = 537 - Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 10 + Height = 24 + Top = 49 + Width = 144 Caption = 'ICShowHelpCheckBox' ParentShowHint = False ShowHint = True @@ -86,16 +73,13 @@ object CodetoolsIndentifierCompletionOptionsFrame: TCodetoolsIndentifierCompleti end object ICReplaceCheckBox: TCheckBox AnchorSideLeft.Control = Owner - AnchorSideTop.Control = ICAutoAddParameterBracketsCheckBox + AnchorSideTop.Control = ICMiscDividerBevel AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 119 - Width = 537 - Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 10 + Height = 24 + Top = 268 + Width = 134 Caption = 'ICReplaceCheckBox' ParentShowHint = False ShowHint = True @@ -105,26 +89,22 @@ object CodetoolsIndentifierCompletionOptionsFrame: TCodetoolsIndentifierCompleti AnchorSideLeft.Control = Owner AnchorSideTop.Control = ICAddAssignOperatorCheckBox AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 17 - Top = 46 - Width = 537 - Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 6 + Height = 24 + Top = 138 + Width = 128 Caption = 'ICAddDoCheckBox' TabOrder = 6 end object ICSortForHistoryCheckBox: TCheckBox AnchorSideLeft.Control = Owner - AnchorSideTop.Control = ICShowHelpCheckBox + AnchorSideTop.Control = ICSortDividerBevel AnchorSideTop.Side = asrBottom Left = 0 - Height = 17 - Top = 173 - Width = 146 - BorderSpacing.Top = 10 + Height = 24 + Top = 203 + Width = 170 Caption = 'ICSortForHistoryCheckBox' TabOrder = 7 end @@ -133,12 +113,73 @@ object CodetoolsIndentifierCompletionOptionsFrame: TCodetoolsIndentifierCompleti AnchorSideTop.Control = ICSortForHistoryCheckBox AnchorSideTop.Side = asrBottom Left = 0 - Height = 17 - Top = 190 - Width = 141 + Height = 24 + Top = 227 + Width = 164 Caption = 'ICSortForScopeCheckBox' ParentShowHint = False ShowHint = True TabOrder = 8 end + object ICOpenDividerBevel: TDividerBevel + AnchorSideLeft.Control = Owner + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 0 + Height = 15 + Top = 10 + Width = 537 + Caption = 'ICOpenDividerBevel' + Anchors = [akTop, akLeft, akRight] + Font.Style = [fsBold] + ParentFont = False + end + object ICAddDividerBevel: TDividerBevel + AnchorSideLeft.Control = Owner + AnchorSideTop.Control = ICShowHelpCheckBox + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 0 + Height = 15 + Top = 75 + Width = 537 + Caption = 'ICAddDividerBevel' + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 2 + Font.Style = [fsBold] + ParentFont = False + end + object ICSortDividerBevel: TDividerBevel + AnchorSideLeft.Control = Owner + AnchorSideTop.Control = ICAutoAddParameterBracketsCheckBox + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 0 + Height = 15 + Top = 188 + Width = 537 + Caption = 'ICSortDividerBevel' + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 2 + Font.Style = [fsBold] + ParentFont = False + end + object ICMiscDividerBevel: TDividerBevel + AnchorSideLeft.Control = Owner + AnchorSideTop.Control = ICSortForScopeCheckBox + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 0 + Height = 15 + Top = 253 + Width = 537 + Caption = 'ICMiscDividerBevel' + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 2 + Font.Style = [fsBold] + ParentFont = False + end end diff --git a/ide/frames/codetools_identifiercompletion_options.pas b/ide/frames/codetools_identifiercompletion_options.pas index a8feae763c..6175b73dda 100644 --- a/ide/frames/codetools_identifiercompletion_options.pas +++ b/ide/frames/codetools_identifiercompletion_options.pas @@ -26,7 +26,7 @@ interface uses Classes, SysUtils, FileUtil, Forms, StdCtrls, - CodeToolsOptions, LazarusIDEStrConsts, IDEOptionsIntf; + CodeToolsOptions, LazarusIDEStrConsts, IDEOptionsIntf, DividerBevel; type @@ -35,11 +35,15 @@ type TCodetoolsIndentifierCompletionOptionsFrame = class(TAbstractIDEOptionsEditor) ICAddDoCheckBox: TCheckBox; ICAutoAddParameterBracketsCheckBox: TCheckBox; + ICMiscDividerBevel: TDividerBevel; + ICOpenDividerBevel: TDividerBevel; ICAutoStartAfterPointCheckBox: TCheckBox; ICAddAssignOperatorCheckBox: TCheckBox; ICAddSemicolonCheckBox: TCheckBox; + ICAddDividerBevel: TDividerBevel; ICReplaceCheckBox: TCheckBox; ICShowHelpCheckBox: TCheckBox; + ICSortDividerBevel: TDividerBevel; ICSortForHistoryCheckBox: TCheckBox; ICSortForScopeCheckBox: TCheckBox; private @@ -65,21 +69,25 @@ end; procedure TCodetoolsIndentifierCompletionOptionsFrame.Setup( ADialog: TAbstractOptionsEditorDialog); begin - ICAddSemicolonCheckBox.Caption:=dlgAddSemicolon; - ICAddAssignOperatorCheckBox.Caption:=dlgAddAssignmentOperator; - ICAddDoCheckBox.Caption:=lisAddKeywordDo; + ICOpenDividerBevel.Caption:=lisOpen; ICAutoStartAfterPointCheckBox.Caption:=lisAutomaticallyInvokeAfterPoint; - ICAutoAddParameterBracketsCheckBox.Caption:=lisAddParameterBrackets; - - ICReplaceCheckBox.Caption:=lisReplaceWholeIdentifier; - ICReplaceCheckBox.Hint:=lisEnableReplaceWholeIdentifierDisableReplacePrefix; - ICShowHelpCheckBox.Caption:=lisShowHelp; ICShowHelpCheckBox.Hint:=lisBestViewedByInstallingAHTMLControlLikeTurbopowerip; + ICAddDividerBevel.Caption:=lisAdd; + ICAddSemicolonCheckBox.Caption:=dlgAddSemicolon; + ICAddAssignOperatorCheckBox.Caption:=dlgAddAssignmentOperator; + ICAddDoCheckBox.Caption:=lisAddKeywordDo; + ICAutoAddParameterBracketsCheckBox.Caption:=lisAddParameterBrackets; + + ICSortDividerBevel.Caption:=lisSort; ICSortForHistoryCheckBox.Caption:=lisShowRecentlyUsedIdentifiersAtTop; ICSortForScopeCheckBox.Caption:=lisSortForScope; ICSortForScopeCheckBox.Hint:=lisForExampleShowAtTopTheLocalVariablesThenTheMembers; + + ICMiscDividerBevel.Caption:=dlgEnvMisc; + ICReplaceCheckBox.Caption:=lisReplaceWholeIdentifier; + ICReplaceCheckBox.Hint:=lisEnableReplaceWholeIdentifierDisableReplacePrefix; end; procedure TCodetoolsIndentifierCompletionOptionsFrame.ReadSettings( diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index 4f46fcdbc9..64a584b4cb 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -5300,6 +5300,7 @@ resourcestring lisBestViewedByInstallingAHTMLControlLikeTurbopowerip = 'Best viewed by ' +'installing a HTML control like turbopoweriprodsgn'; lisShowRecentlyUsedIdentifiersAtTop = 'Show recently used identifiers at top'; + lisSort = 'Sort'; lisSortForScope = 'Sort for scope'; lisForExampleShowAtTopTheLocalVariablesThenTheMembers = 'For example show at' +' top the local variables, then the members of current class, then of the'