paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 20:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: added string auto-continue mode

Browse Source 
git-svn-id: trunk@40352 -
This commit is contained in:
martin 2013-02-19 03:07:50 +00:00
parent 38bf0149cf
commit af73c2186c
4 changed files with 217 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ide/editoroptions.pp
View File

@ -1367,6 +1367,10 @@ type
FSlashCommentExtend: TSynCommentExtendMode; FSlashCommentExtend: TSynCommentExtendMode;
FSlashIndentAlignMax: integer; FSlashIndentAlignMax: integer;
FStringBreakAppend: String;
FStringBreakEnabled: Boolean;
FStringBreakPrefix: String;
FDefaultValues: TEditorOptions; FDefaultValues: TEditorOptions;
public public
@ -1605,6 +1609,10 @@ type
read FSlashCommentExtend write FSlashCommentExtend; read FSlashCommentExtend write FSlashCommentExtend;
property SlashIndentAlignMax: integer property SlashIndentAlignMax: integer
read FSlashIndentAlignMax write FSlashIndentAlignMax; read FSlashIndentAlignMax write FSlashIndentAlignMax;
property StringBreakEnabled: Boolean read FStringBreakEnabled write FStringBreakEnabled;
property StringBreakAppend: String read FStringBreakAppend write FStringBreakAppend;
property StringBreakPrefix: String read FStringBreakPrefix write FStringBreakPrefix;
end; end;
const const
@ -4385,6 +4393,9 @@ begin
FSlashCommentExtend := sceMatching; FSlashCommentExtend := sceMatching;
FSlashIndentAlignMax := 40; FSlashIndentAlignMax := 40;
FStringBreakEnabled := False;
FStringBreakAppend := ' +';
FStringBreakPrefix := '';
end; end;
@ -5367,6 +5378,9 @@ begin
b.SlashIndentMode := []; b.SlashIndentMode := [];
end; end;
b.StringBreakEnabled := FStringBreakEnabled;
b.StringBreakAppend := FStringBreakAppend;
b.StringBreakPrefix := FStringBreakPrefix;
end; end;

257
ide/frames/editor_indent_options.lfm
View File

@ -15,9 +15,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = BlockIndentComboBox AnchorSideTop.Control = BlockIndentComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 322 Left = 322
Height = 13 Height = 15
Top = 125 Top = 137
Width = 81 Width = 91
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'BlockIndentLabel' Caption = 'BlockIndentLabel'
ParentColor = False ParentColor = False
@ -28,9 +28,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = TabWidthsComboBox AnchorSideTop.Control = TabWidthsComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 322 Left = 322
Height = 13 Height = 15
Top = 29 Top = 31
Width = 76 Width = 85
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'TabWidthsLabel' Caption = 'TabWidthsLabel'
ParentColor = False ParentColor = False
@ -41,9 +41,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = BlockIndentTypeComboBox AnchorSideTop.Control = BlockIndentTypeComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 322 Left = 322
Height = 13 Height = 15
Top = 82 Top = 90
Width = 104 Width = 114
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'AutoIndentTypeLabel' Caption = 'AutoIndentTypeLabel'
ParentColor = False ParentColor = False
@ -53,11 +53,11 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = lblBlockIndentKeys AnchorSideTop.Control = lblBlockIndentKeys
AnchorSideBottom.Control = TabWidthsComboBox AnchorSideBottom.Control = TabWidthsComboBox
Left = 216 Left = 216
Height = 21 Height = 23
Top = 121 Top = 133
Width = 100 Width = 100
BorderSpacing.Top = 3 BorderSpacing.Top = 3
ItemHeight = 13 ItemHeight = 15
Items.Strings = ( Items.Strings = (
'0' '0'
'1' '1'
@ -77,11 +77,11 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 216 Left = 216
Height = 21 Height = 23
Top = 25 Top = 27
Width = 100 Width = 100
BorderSpacing.Top = 6 BorderSpacing.Top = 6
ItemHeight = 13 ItemHeight = 15
Items.Strings = ( Items.Strings = (
'1' '1'
'2' '2'
@ -100,8 +100,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = CenterLabel1 AnchorSideRight.Control = CenterLabel1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 78 Top = 86
Width = 201 Width = 201
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -117,8 +117,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = CenterLabel1 AnchorSideRight.Control = CenterLabel1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 150 Top = 166
Width = 201 Width = 201
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -135,8 +135,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = CenterLabel1 AnchorSideRight.Control = CenterLabel1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 42 Top = 46
Width = 201 Width = 201
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -152,8 +152,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = CenterLabel1 AnchorSideRight.Control = CenterLabel1
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 25 Top = 27
Width = 201 Width = 201
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
@ -168,10 +168,10 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = AutoIndentCheckBox AnchorSideTop.Control = AutoIndentCheckBox
AnchorSideBottom.Control = TabWidthsComboBox AnchorSideBottom.Control = TabWidthsComboBox
Left = 216 Left = 216
Height = 21 Height = 23
Top = 78 Top = 86
Width = 100 Width = 100
ItemHeight = 13 ItemHeight = 15
ItemWidth = 200 ItemWidth = 200
OnChange = ComboboxOnChange OnChange = ComboboxOnChange
OnExit = ComboBoxOnExit OnExit = ComboBoxOnExit
@ -185,9 +185,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Cursor = crHandPoint Cursor = crHandPoint
Left = 24 Left = 24
Height = 13 Height = 15
Top = 95 Top = 105
Width = 73 Width = 82
BorderSpacing.Left = 18 BorderSpacing.Left = 18
Caption = 'AutoIndentLink' Caption = 'AutoIndentLink'
Font.Color = clBlue Font.Color = clBlue
@ -212,7 +212,7 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 13 Height = 15
Top = 6 Top = 6
Width = 433 Width = 433
Caption = 'TabsGroupDivider' Caption = 'TabsGroupDivider'
@ -228,11 +228,11 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideBottom.Control = TabWidthsComboBox AnchorSideBottom.Control = TabWidthsComboBox
Left = 216 Left = 216
Height = 21 Height = 23
Top = 145 Top = 159
Width = 100 Width = 100
BorderSpacing.Top = 3 BorderSpacing.Top = 3
ItemHeight = 13 ItemHeight = 15
Items.Strings = ( Items.Strings = (
'0' '0'
'1' '1'
@ -249,9 +249,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = BlockTabIndentComboBox AnchorSideTop.Control = BlockTabIndentComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 322 Left = 322
Height = 13 Height = 15
Top = 149 Top = 163
Width = 81 Width = 91
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'BlockIndentLabel' Caption = 'BlockIndentLabel'
ParentColor = False ParentColor = False
@ -261,10 +261,10 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblBlockIndentKeys AnchorSideTop.Control = lblBlockIndentKeys
Cursor = crHandPoint Cursor = crHandPoint
Left = 101 Left = 112
Height = 13 Height = 15
Top = 118 Top = 130
Width = 74 Width = 85
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'BlockIndentLink' Caption = 'BlockIndentLink'
Font.Color = clBlue Font.Color = clBlue
@ -279,9 +279,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = AutoIndentLink AnchorSideTop.Control = AutoIndentLink
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 13 Height = 15
Top = 118 Top = 130
Width = 89 Width = 100
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 10 BorderSpacing.Top = 10
Caption = 'lblBlockIndentKeys' Caption = 'lblBlockIndentKeys'
@ -294,8 +294,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 13 Height = 15
Top = 65 Top = 71
Width = 433 Width = 433
Caption = 'IndentsGroupDivider' Caption = 'IndentsGroupDivider'
Autosize = True Autosize = True
@ -309,9 +309,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = lblBlockIndentKeys AnchorSideTop.Control = lblBlockIndentKeys
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 13 Height = 15
Top = 134 Top = 148
Width = 107 Width = 121
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'lblBlockIndentShortcut' Caption = 'lblBlockIndentShortcut'
@ -324,8 +324,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 13 Height = 15
Top = 173 Top = 191
Width = 433 Width = 433
Caption = 'CommentsGroupDivider' Caption = 'CommentsGroupDivider'
Autosize = True Autosize = True
@ -341,8 +341,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 24 Height = 25
Top = 186 Top = 206
Width = 433 Width = 433
Align = alNone Align = alNone
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
@ -363,7 +363,7 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
end end
object tbCurly: TToolButton object tbCurly: TToolButton
Tag = 1 Tag = 1
Left = 39 Left = 43
Top = 0 Top = 0
AutoSize = True AutoSize = True
Caption = 'tbCurly' Caption = 'tbCurly'
@ -373,7 +373,7 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
end end
object tbShlash: TToolButton object tbShlash: TToolButton
Tag = 2 Tag = 2
Left = 82 Left = 90
Top = 0 Top = 0
AutoSize = True AutoSize = True
Caption = 'tbShlash' Caption = 'tbShlash'
@ -381,6 +381,16 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
OnClick = tbAnsiClick OnClick = tbAnsiClick
Style = tbsCheck Style = tbsCheck
end end
object tbString: TToolButton
Tag = 3
Left = 143
Top = 0
AutoSize = True
Caption = 'tbString'
Grouped = True
OnClick = tbAnsiClick
Style = tbsCheck
end
end end
object CenterLabel1: TLabel object CenterLabel1: TLabel
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
@ -398,8 +408,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 189 Height = 203
Top = 210 Top = 231
Width = 433 Width = 433
PageIndex = 0 PageIndex = 0
AutoSize = True AutoSize = True
@ -411,9 +421,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideLeft.Control = AnsiPage AnchorSideLeft.Control = AnsiPage
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 17 Height = 19
Top = 3 Top = 3
Width = 147 Width = 166
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 3 BorderSpacing.Top = 3
Caption = 'cbAnsiEnableAutoContinue' Caption = 'cbAnsiEnableAutoContinue'
@ -425,9 +435,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = edAnsiMatch AnchorSideTop.Control = edAnsiMatch
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 13 Height = 15
Top = 34 Top = 36
Width = 57 Width = 67
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'lbAnsiMatch' Caption = 'lbAnsiMatch'
ParentColor = False ParentColor = False
@ -439,10 +449,10 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = AnsiPage AnchorSideRight.Control = AnsiPage
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 69 Left = 79
Height = 21 Height = 23
Top = 30 Top = 32
Width = 354 Width = 344
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 10 BorderSpacing.Top = 10
@ -455,9 +465,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Control = edAnsiPrefix AnchorSideTop.Control = edAnsiPrefix
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 13 Height = 15
Top = 98 Top = 104
Width = 56 Width = 62
BorderSpacing.Left = 6 BorderSpacing.Left = 6
Caption = 'lbAnsiPrefix' Caption = 'lbAnsiPrefix'
ParentColor = False ParentColor = False
@ -469,10 +479,10 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = AnsiPage AnchorSideRight.Control = AnsiPage
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 68 Left = 74
Height = 21 Height = 23
Top = 94 Top = 100
Width = 355 Width = 349
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 16 BorderSpacing.Top = 16
@ -486,14 +496,14 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = AnsiPage AnchorSideRight.Control = AnsiPage
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 69 Left = 79
Height = 21 Height = 23
Top = 57 Top = 61
Width = 354 Width = 344
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 10 BorderSpacing.Right = 10
ItemHeight = 13 ItemHeight = 15
Style = csDropDownList Style = csDropDownList
TabOrder = 3 TabOrder = 3
end end
@ -503,14 +513,14 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = AnsiPage AnchorSideRight.Control = AnsiPage
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 68 Left = 74
Height = 21 Height = 23
Top = 121 Top = 129
Width = 355 Width = 349
Anchors = [akTop, akLeft, akRight] Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6 BorderSpacing.Top = 6
BorderSpacing.Right = 10 BorderSpacing.Right = 10
ItemHeight = 13 ItemHeight = 15
OnChange = cbAnsiIndentModeChange OnChange = cbAnsiIndentModeChange
Style = csDropDownList Style = csDropDownList
TabOrder = 4 TabOrder = 4
@ -521,8 +531,8 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 6 Left = 6
Height = 21 Height = 23
Top = 168 Top = 180
Width = 100 Width = 100
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 3 BorderSpacing.Top = 3
@ -535,9 +545,9 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 6 Left = 6
Height = 13 Height = 15
Top = 152 Top = 162
Width = 71 Width = 83
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 10 BorderSpacing.Top = 10
Caption = 'lbAnsiAlignMax' Caption = 'lbAnsiAlignMax'
@ -836,5 +846,78 @@ object EditorIndentOptionsFrame: TEditorIndentOptionsFrame
WordWrap = True WordWrap = True
end end
end end
object StringPage: TPage
object cbStringEnableAutoContinue: TCheckBox
AnchorSideLeft.Control = StringPage
AnchorSideTop.Control = StringPage
Left = 6
Height = 19
Top = 3
Width = 174
BorderSpacing.Left = 6
BorderSpacing.Top = 3
Caption = 'cbStringEnableAutoContinue'
OnChange = cbStringEnableAutoContinueChange
TabOrder = 0
end
object lbStringAutoAppend: TLabel
AnchorSideLeft.Control = StringPage
AnchorSideTop.Control = edStringAutoAppend
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 32
Width = 109
BorderSpacing.Left = 6
Caption = 'lbStringAutoAppend'
ParentColor = False
end
object lbStringAutoPrefix: TLabel
AnchorSideLeft.Control = StringPage
AnchorSideTop.Control = edStringAutoPrefix
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 61
Width = 96
BorderSpacing.Left = 6
Caption = 'lbStringAutoPrefix'
ParentColor = False
end
object edStringAutoAppend: TEdit
AnchorSideLeft.Control = lbStringAutoAppend
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = cbStringEnableAutoContinue
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = StringPage
AnchorSideRight.Side = asrBottom
Left = 121
Height = 23
Top = 28
Width = 306
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
TabOrder = 1
end
object edStringAutoPrefix: TEdit
AnchorSideLeft.Control = lbStringAutoPrefix
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = edStringAutoAppend
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = StringPage
AnchorSideRight.Side = asrBottom
Left = 108
Height = 23
Top = 57
Width = 319
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 6
BorderSpacing.Top = 6
BorderSpacing.Right = 6
TabOrder = 2
end
end
end end
end end

29
ide/frames/editor_indent_options.pas
View File

@ -45,7 +45,12 @@ type
AutoIndentTypeLabel: TLabel; AutoIndentTypeLabel: TLabel;
cbSlashExtend: TComboBox; cbSlashExtend: TComboBox;
CenterLabel1: TLabel; CenterLabel1: TLabel;
cbStringEnableAutoContinue: TCheckBox;
CommentsGroupDivider: TDividerBevel; CommentsGroupDivider: TDividerBevel;
edStringAutoAppend: TEdit;
edStringAutoPrefix: TEdit;
lbStringAutoAppend: TLabel;
lbStringAutoPrefix: TLabel;
lblBlockIndentShortcut: TLabel; lblBlockIndentShortcut: TLabel;
cbAnsiEnableAutoContinue: TCheckBox; cbAnsiEnableAutoContinue: TCheckBox;
@ -82,6 +87,7 @@ type
Notebook1: TNotebook; Notebook1: TNotebook;
AnsiPage: TPage; AnsiPage: TPage;
CurlyPage: TPage; CurlyPage: TPage;
StringPage: TPage;
SlashPage: TPage; SlashPage: TPage;
TabsGroupDivider: TDividerBevel; TabsGroupDivider: TDividerBevel;
AutoIndentLink: TLabel; AutoIndentLink: TLabel;
@ -97,6 +103,7 @@ type
tbAnsi: TToolButton; tbAnsi: TToolButton;
tbCurly: TToolButton; tbCurly: TToolButton;
tbShlash: TToolButton; tbShlash: TToolButton;
tbString: TToolButton;
procedure AutoIndentCheckBoxChange(Sender: TObject); procedure AutoIndentCheckBoxChange(Sender: TObject);
procedure AutoIndentLinkClick(Sender: TObject); procedure AutoIndentLinkClick(Sender: TObject);
procedure AutoIndentLinkMouseEnter(Sender: TObject); procedure AutoIndentLinkMouseEnter(Sender: TObject);
@ -108,6 +115,7 @@ type
procedure cbCurlyIndentModeChange(Sender: TObject); procedure cbCurlyIndentModeChange(Sender: TObject);
procedure cbSlashEnableAutoContinueChange(Sender: TObject); procedure cbSlashEnableAutoContinueChange(Sender: TObject);
procedure cbSlashIndentModeChange(Sender: TObject); procedure cbSlashIndentModeChange(Sender: TObject);
procedure cbStringEnableAutoContinueChange(Sender: TObject);
procedure ComboboxOnChange(Sender: TObject); procedure ComboboxOnChange(Sender: TObject);
procedure ComboboxOnKeyDown(Sender: TObject; var Key: Word; procedure ComboboxOnKeyDown(Sender: TObject; var Key: Word;
Shift: TShiftState); Shift: TShiftState);
@ -187,6 +195,7 @@ begin
tbAnsi.Caption := dlgAnsiCommentTab; tbAnsi.Caption := dlgAnsiCommentTab;
tbCurly.Caption := dlgCurlyCommentTab; tbCurly.Caption := dlgCurlyCommentTab;
tbShlash.Caption := dlgSlashCommentTab; tbShlash.Caption := dlgSlashCommentTab;
tbString.Caption := dlgStringBreakIndentTab;
Notebook1.AutoSize := True; Notebook1.AutoSize := True;
@ -244,6 +253,10 @@ begin
cbSlashExtend.Items.Add(dlgCommentShlashExtendAlways); cbSlashExtend.Items.Add(dlgCommentShlashExtendAlways);
cbSlashExtend.Items.Add(dlgCommentShlashExtendAlwaysSplit); cbSlashExtend.Items.Add(dlgCommentShlashExtendAlwaysSplit);
cbStringEnableAutoContinue.Caption := dlgStringEnableAutoContinue;
lbStringAutoAppend.Caption := dlgStringAutoAppend;
lbStringAutoPrefix.Caption := dlgStringAutoPrefix;
end; end;
procedure TEditorIndentOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TEditorIndentOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
@ -319,6 +332,10 @@ begin
cbSlashEnableAutoContinueChange(nil); cbSlashEnableAutoContinueChange(nil);
cbSlashIndentModeChange(nil); cbSlashIndentModeChange(nil);
cbStringEnableAutoContinue.Checked := StringBreakEnabled;
edStringAutoAppend.Text := StringBreakAppend;
edStringAutoPrefix.Text := StringBreakPrefix;
cbStringEnableAutoContinueChange(nil);
end; end;
end; end;
@ -425,6 +442,9 @@ begin
SlashCommentExtend := IdxToExtendMode[cbSlashExtend.ItemIndex]; SlashCommentExtend := IdxToExtendMode[cbSlashExtend.ItemIndex];
StringBreakEnabled := cbStringEnableAutoContinue.Checked;
StringBreakAppend := edStringAutoAppend.Text;
StringBreakPrefix := edStringAutoPrefix.Text;
end; end;
end; end;
@ -522,6 +542,7 @@ begin
edAnsiPrefix.Enabled := cbAnsiEnableAutoContinue.Checked; edAnsiPrefix.Enabled := cbAnsiEnableAutoContinue.Checked;
cbAnsiMatchMode.Enabled := cbAnsiEnableAutoContinue.Checked; cbAnsiMatchMode.Enabled := cbAnsiEnableAutoContinue.Checked;
cbAnsiIndentMode.Enabled := cbAnsiEnableAutoContinue.Checked; cbAnsiIndentMode.Enabled := cbAnsiEnableAutoContinue.Checked;
edAnsiAlignMax.Enabled := cbAnsiEnableAutoContinue.Checked;
end; end;
procedure TEditorIndentOptionsFrame.cbAnsiIndentModeChange(Sender: TObject); procedure TEditorIndentOptionsFrame.cbAnsiIndentModeChange(Sender: TObject);
@ -538,6 +559,7 @@ begin
edCurlyPrefix.Enabled := cbCurlyEnableAutoContinue.Checked; edCurlyPrefix.Enabled := cbCurlyEnableAutoContinue.Checked;
cbCurlyMatchMode.Enabled := cbCurlyEnableAutoContinue.Checked; cbCurlyMatchMode.Enabled := cbCurlyEnableAutoContinue.Checked;
cbCurlyIndentMode.Enabled := cbCurlyEnableAutoContinue.Checked; cbCurlyIndentMode.Enabled := cbCurlyEnableAutoContinue.Checked;
edCurlyAlignMax.Enabled := cbCurlyEnableAutoContinue.Checked;
end; end;
procedure TEditorIndentOptionsFrame.cbCurlyIndentModeChange(Sender: TObject); procedure TEditorIndentOptionsFrame.cbCurlyIndentModeChange(Sender: TObject);
@ -555,6 +577,7 @@ begin
cbSlashMatchMode.Enabled := cbSlashEnableAutoContinue.Checked; cbSlashMatchMode.Enabled := cbSlashEnableAutoContinue.Checked;
cbSlashIndentMode.Enabled := cbSlashEnableAutoContinue.Checked; cbSlashIndentMode.Enabled := cbSlashEnableAutoContinue.Checked;
cbSlashExtend.Enabled := cbSlashEnableAutoContinue.Checked; cbSlashExtend.Enabled := cbSlashEnableAutoContinue.Checked;
edSlashAlignMax.Enabled := cbSlashEnableAutoContinue.Checked;
end; end;
procedure TEditorIndentOptionsFrame.cbSlashIndentModeChange(Sender: TObject); procedure TEditorIndentOptionsFrame.cbSlashIndentModeChange(Sender: TObject);
@ -565,6 +588,12 @@ begin
end; end;
end; end;
procedure TEditorIndentOptionsFrame.cbStringEnableAutoContinueChange(Sender: TObject);
begin
edStringAutoAppend.Enabled := cbStringEnableAutoContinue.Checked;
edStringAutoPrefix.Enabled := cbStringEnableAutoContinue.Checked;
end;
procedure TEditorIndentOptionsFrame.ComboboxOnKeyDown( procedure TEditorIndentOptionsFrame.ComboboxOnKeyDown(
Sender: TObject; var Key: Word; Shift: TShiftState); Sender: TObject; var Key: Word; Shift: TShiftState);
begin begin

4
ide/lazarusidestrconsts.pas
View File

@ -1387,6 +1387,7 @@ resourcestring
dlgAnsiCommentTab = 'Ansi (* *)'; dlgAnsiCommentTab = 'Ansi (* *)';
dlgCurlyCommentTab = 'Curly { }'; dlgCurlyCommentTab = 'Curly { }';
dlgSlashCommentTab = 'Slash //'; dlgSlashCommentTab = 'Slash //';
dlgStringBreakIndentTab = 'String ''''';
dlgCommentContinue = 'Prefix comments on linebreak'; dlgCommentContinue = 'Prefix comments on linebreak';
dlgCommentContinueMatch = 'Match current line'; dlgCommentContinueMatch = 'Match current line';
@ -1404,6 +1405,9 @@ resourcestring
dlgCommentShlashExtendMatchSplit = 'Extend, if matched and caret in the middle of text (not at EOL)'; dlgCommentShlashExtendMatchSplit = 'Extend, if matched and caret in the middle of text (not at EOL)';
dlgCommentShlashExtendAlways = 'Extend, if matched or not matched'; dlgCommentShlashExtendAlways = 'Extend, if matched or not matched';
dlgCommentShlashExtendAlwaysSplit = 'Extend, if matched or not matched (not at EOL)'; dlgCommentShlashExtendAlwaysSplit = 'Extend, if matched or not matched (not at EOL)';
dlgStringEnableAutoContinue = 'Extend strings on linebreak';
dlgStringAutoAppend = 'Append text to close string';
dlgStringAutoPrefix = 'Prefix string on new line';
dlgUndoAfterSave = 'Undo after save'; dlgUndoAfterSave = 'Undo after save';
dlgFindTextatCursor = 'Find text at cursor'; dlgFindTextatCursor = 'Find text at cursor';