paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 09:39:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Editor Option: Group multi caret options / Improve descriptions. Issue #0033770

Browse Source 
git-svn-id: trunk@58183 -
This commit is contained in:
martin 2018-06-08 10:47:38 +00:00
parent 5fcdd06c6a
commit 6bc9e7458c
3 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ide/frames/editor_general_options.lfm
View File

@ -7,8 +7,8 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
ClientWidth = 434
TabOrder = 0
Visible = False
DesignLeft = 295
DesignTop = 212
DesignLeft = 399
DesignTop = 233
object UndoLimitLabel: TLabel
AnchorSideLeft.Control = UndoLimitComboBox
AnchorSideLeft.Side = asrBottom
@ -201,7 +201,7 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 19
Top = 292
Top = 319
Width = 152
BorderSpacing.Left = 6
BorderSpacing.Top = 6
@ -215,7 +215,7 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 218
Height = 19
Top = 292
Top = 319
Width = 152
BorderSpacing.Top = 6
Caption = 'OverwriteBlockCheckBox'
@ -296,7 +296,7 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
AnchorSideRight.Side = asrBottom
Left = 0
Height = 15
Top = 271
Top = 298
Width = 434
Caption = 'BlockGroupDivider'
Anchors = [akTop, akLeft, akRight]
@ -317,13 +317,14 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
end
object MultiCaretOnColumnSelection: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ScrollPastEndLineCheckBox
AnchorSideTop.Control = MultiCaretGroupDivider
AnchorSideTop.Side = asrBottom
Left = 6
Height = 19
Top = 227
Top = 254
Width = 183
BorderSpacing.Left = 6
BorderSpacing.Top = 6
Caption = 'MultiCaretOnColumnSelection'
TabOrder = 17
end
@ -332,7 +333,7 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
AnchorSideTop.Control = MultiCaretOnColumnSelection
Left = 218
Height = 19
Top = 227
Top = 254
Width = 169
Caption = 'chkMultiCaretColumnMode'
TabOrder = 18
@ -343,10 +344,26 @@ object EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
AnchorSideTop.Side = asrBottom
Left = 6
Height = 19
Top = 246
Top = 273
Width = 126
BorderSpacing.Left = 6
Caption = 'chkMultiCaretMode'
TabOrder = 19
end
object MultiCaretGroupDivider: TDividerBevel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = ScrollPastEndLineCheckBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 0
Height = 15
Top = 233
Width = 434
Caption = 'MultiCaretGroupDivider'
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Font.Style = [fsBold]
ParentFont = False
end
end

6
ide/frames/editor_general_options.pas
View File

@ -36,6 +36,7 @@ type
TEditorGeneralOptionsFrame = class(TAbstractIDEOptionsEditor)
chkMultiCaretColumnMode: TCheckBox;
chkMultiCaretMode: TCheckBox;
MultiCaretGroupDivider: TDividerBevel;
MultiCaretOnColumnSelection: TCheckBox;
CursorSkipsTabCheckBox: TCheckBox;
CaretGroupDivider: TDividerBevel;
@ -133,7 +134,7 @@ begin
// caret + key navigation
CaretGroupDivider.Caption := dlgCursorGroupOptions;
CaretGroupDivider.Caption := dlgCaretGroupOptions;
KeepCursorXCheckBox.Caption := dlgKeepCursorX;
PersistentCursorCheckBox.Caption := dlgPersistentCursor;
AlwaysVisibleCursorCheckBox.Caption := dlgAlwaysVisibleCursor;
@ -141,6 +142,9 @@ begin
CursorSkipsTabCheckBox.Caption := dlgCursorSkipsTab;
HomeKeyJumpsToNearestStartCheckBox.Caption := dlgHomeKeyJumpsToNearestStart;
EndKeyJumpsToNearestStartCheckBox.Caption := dlgEndKeyJumpsToNearestStart;
// multi caret
MultiCaretGroupDivider.Caption := dlgMultiCaretGroupOptions;
MultiCaretOnColumnSelection.Caption := dlgMultiCaretOnColumnSelection;
chkMultiCaretColumnMode.Caption := dlgMultiCaretColumnMode;
chkMultiCaretMode.Caption := dlgMultiCaretMode;

9
ide/lazarusidestrconsts.pas
View File

@ -1622,7 +1622,8 @@ resourcestring
dlgIndentsTabsGroupOptions = 'Tabs';
dlgIndentsIndentGroupOptions = 'Indent';
dlgCommentIndentGroupOptions = 'Comments';
dlgCursorGroupOptions = 'Cursor';
dlgCaretGroupOptions = 'Cursor';
dlgMultiCaretGroupOptions = 'Multi-caret';
dlgBlockGroupOptions = 'Selection';
dlgAlwaysVisibleCursor = 'Always visible cursor';
dlgAutoIndent = 'Auto indent';
@ -1848,9 +1849,9 @@ resourcestring
dlgCopyWordAtCursorOnCopyNone = 'Copy word on copy none';
dlgHomeKeyJumpsToNearestStart = 'Home key jumps to nearest start';
dlgEndKeyJumpsToNearestStart = 'End key jumps to nearest end';
dlgMultiCaretOnColumnSelection = 'Enable multi caret for column selection';
dlgMultiCaretColumnMode = 'Multi-caret (column-select) move with cursor';
dlgMultiCaretMode = 'Multi-caret move with cursor';
dlgMultiCaretOnColumnSelection = 'Enable multi-caret for column selection';
dlgMultiCaretColumnMode = 'Navigation keys move all carets (column-select)';
dlgMultiCaretMode = 'Navigation keys move all carets';
dlgColorLink = '(Edit Color)';
dlgKeyLink = '(Edit Key)';
dlgBracketHighlight = 'Bracket highlight';