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

ide: add an ability to change gutter separator position

Browse Source 
git-svn-id: trunk@18060 -
This commit is contained in:
paul 2009-01-02 17:59:15 +00:00
parent f9dc5024c6
commit 376c4dca6f
5 changed files with 197 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ide/editoroptions.pp
View File

@ -18,7 +18,7 @@
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* * * *
*************************************************************************** ***************************************************************************
Author: Mattias Gaertner Author: Mattias Gaertner
Abstract: Abstract:
@ -62,12 +62,12 @@ type
TLazSyntaxHighlighter = TLazSyntaxHighlighter =
(lshNone, lshText, lshFreePascal, lshDelphi, lshLFM, lshXML, lshHTML, (lshNone, lshText, lshFreePascal, lshDelphi, lshLFM, lshXML, lshHTML,
lshCPP, lshPerl, lshJava, lshBash, lshPython, lshPHP, lshSQL, lshJScript); lshCPP, lshPerl, lshJava, lshBash, lshPython, lshPHP, lshSQL, lshJScript);
TPascalHilightAttribute = ( TPascalHilightAttribute = (
phaAssembler, phaComment, phaDirective, phaReservedWord, phaNumber, phaAssembler, phaComment, phaDirective, phaReservedWord, phaNumber,
phaString, phaSymbol phaString, phaSymbol
); );
const const
PascalHilightAttributeNames: array[TPascalHilightAttribute] of String = ( PascalHilightAttributeNames: array[TPascalHilightAttribute] of String = (
SYNS_AttrAssembler, SYNS_AttrAssembler,
@ -122,7 +122,7 @@ const
dlgGutter, dlgGutter,
dlgRightMargin dlgRightMargin
); );
type type
TSchemeAttribute = record TSchemeAttribute = record
BG, FG, FC: TColor; BG, FG, FC: TColor;
@ -137,7 +137,7 @@ type
Additional: array[TAdditionalHilightAttribute] of TSchemeAttribute; Additional: array[TAdditionalHilightAttribute] of TSchemeAttribute;
Single: array[TSingleColorAttribute] of TColor; Single: array[TSingleColorAttribute] of TColor;
end; end;
const const
DEFAULT_COLOR_SCHEME: TPascalColorScheme = ( DEFAULT_COLOR_SCHEME: TPascalColorScheme = (
Name: 'Default'; Name: 'Default';
@ -175,7 +175,7 @@ const
{ shaRightMargin } clSilver { shaRightMargin } clSilver
) )
); );
TWILIGHT_COLOR_SCHEME: TPascalColorScheme = ( TWILIGHT_COLOR_SCHEME: TPascalColorScheme = (
Name: 'Twilight'; Name: 'Twilight';
Default: (BG: clBlack; FG: clWhite; FC: clNone; Styles: []; StylesMask: []); Default: (BG: clBlack; FG: clWhite; FC: clNone; Styles: []; StylesMask: []);
@ -249,7 +249,7 @@ const
{ shaRightMargin } clSilver { shaRightMargin } clSilver
) )
); );
OCEAN_COLOR_SCHEME: TPascalColorScheme = ( OCEAN_COLOR_SCHEME: TPascalColorScheme = (
Name: 'Ocean'; Name: 'Ocean';
Default: (BG: clNavy; FG: clYellow; FC: clNone; Styles: []; StylesMask: []); Default: (BG: clNavy; FG: clYellow; FC: clNone; Styles: []; StylesMask: []);
@ -439,6 +439,7 @@ type
fShowOnlyLineNumbersMultiplesOf: integer; fShowOnlyLineNumbersMultiplesOf: integer;
fGutterColor: TColor; fGutterColor: TColor;
fGutterWidth: Integer; fGutterWidth: Integer;
FGutterSeparatorIndex: Integer;
fRightMargin: Integer; fRightMargin: Integer;
fRightMarginColor: TColor; fRightMarginColor: TColor;
fEditorFont: String; fEditorFont: String;
@ -542,6 +543,8 @@ type
read fGutterColor write fGutterColor default clBtnFace; read fGutterColor write fGutterColor default clBtnFace;
property GutterWidth: Integer property GutterWidth: Integer
read fGutterWidth write fGutterWidth default 30; read fGutterWidth write fGutterWidth default 30;
property GutterSeparatorIndex: Integer read FGutterSeparatorIndex
write FGutterSeparatorIndex default 3;
property RightMargin: Integer property RightMargin: Integer
read fRightMargin write fRightMargin default 80; read fRightMargin write fRightMargin default 80;
property RightMarginColor: Integer property RightMarginColor: Integer
@ -1355,6 +1358,7 @@ begin
fUndoLimit := 32767; fUndoLimit := 32767;
fTabWidth := 8; fTabWidth := 8;
FBracketHighlightStyle := sbhsBoth; FBracketHighlightStyle := sbhsBoth;
FGutterSeparatorIndex := 3;
// Display options // Display options
fEditorFont := SynDefaultFontName; fEditorFont := SynDefaultFontName;
@ -1388,7 +1392,7 @@ begin
fCodeTemplateFileName, '"'); fCodeTemplateFileName, '"');
end; end;
end; end;
// Code Folding // Code Folding
FCFDividerDrawLevel := 4; FCFDividerDrawLevel := 4;
end; end;
@ -1488,6 +1492,8 @@ begin
XMLConfig.GetValue('EditorOptions/Display/GutterColor', clBtnFace); XMLConfig.GetValue('EditorOptions/Display/GutterColor', clBtnFace);
fGutterWidth := fGutterWidth :=
XMLConfig.GetValue('EditorOptions/Display/GutterWidth', 30); XMLConfig.GetValue('EditorOptions/Display/GutterWidth', 30);
FGutterSeparatorIndex :=
XMLConfig.GetValue('EditorOptions/Display/GutterSeparatorIndex', 3);
fRightMargin := fRightMargin :=
XMLConfig.GetValue('EditorOptions/Display/RightMargin', 80); XMLConfig.GetValue('EditorOptions/Display/RightMargin', 80);
fRightMarginColor := fRightMarginColor :=
@ -1630,6 +1636,8 @@ begin
fGutterColor, clBtnFace); fGutterColor, clBtnFace);
XMLConfig.SetDeleteValue('EditorOptions/Display/GutterWidth', XMLConfig.SetDeleteValue('EditorOptions/Display/GutterWidth',
fGutterWidth, 30); fGutterWidth, 30);
XMLConfig.SetDeleteValue('EditorOptions/Display/GutterSeparatorIndex',
fGutterSeparatorIndex, 3);
XMLConfig.SetDeleteValue('EditorOptions/Display/RightMargin', XMLConfig.SetDeleteValue('EditorOptions/Display/RightMargin',
fRightMargin, 80); fRightMargin, 80);
XMLConfig.SetDeleteValue('EditorOptions/Display/RightMarginColor', XMLConfig.SetDeleteValue('EditorOptions/Display/RightMarginColor',
@ -1848,7 +1856,7 @@ begin
Attr.StyleMask := Scheme.Attributes[pha].StylesMask; Attr.StyleMask := Scheme.Attributes[pha].StylesMask;
Exit; Exit;
end; end;
for aha := low(aha) to High(aha) do for aha := low(aha) to High(aha) do
begin begin
if AttriName <> LowerCase(AdditionalHighlightAttributes[aha]) then Continue; if AttriName <> LowerCase(AdditionalHighlightAttributes[aha]) then Continue;
@ -1865,7 +1873,7 @@ begin
Attr.StyleMask := Scheme.Additional[aha].StylesMask; Attr.StyleMask := Scheme.Additional[aha].StylesMask;
Exit; Exit;
end; end;
Attr.Foreground := Scheme.Default.FG; Attr.Foreground := Scheme.Default.FG;
Attr.Background := Scheme.Default.BG; Attr.Background := Scheme.Default.BG;
Attr.FrameColor := Scheme.Default.FC; Attr.FrameColor := Scheme.Default.FC;
@ -2137,7 +2145,7 @@ begin
if Attrib.Name = '' then Continue; if Attrib.Name = '' then Continue;
if LowerCase(Attrib.Name) <> LowerCase(AdditionalHighlightAttributes[AddHilightAttr]) if LowerCase(Attrib.Name) <> LowerCase(AdditionalHighlightAttributes[AddHilightAttr])
then Continue; then Continue;
FG := Attrib.Foreground; FG := Attrib.Foreground;
BG := Attrib.Background; BG := Attrib.Background;
Styles := Attrib.Style; Styles := Attrib.Style;
@ -2145,7 +2153,7 @@ begin
Exit((FG <> clNone) or (BG <> clNone) or (Styles <> []) or (StylesMask <> [])); Exit((FG <> clNone) or (BG <> clNone) or (Styles <> []) or (StylesMask <> []));
end; end;
end; end;
// set default // set default
FG := DEFAULT_COLOR_SCHEME.Additional[AddHilightAttr].FG; FG := DEFAULT_COLOR_SCHEME.Additional[AddHilightAttr].FG;
BG := DEFAULT_COLOR_SCHEME.Additional[AddHilightAttr].BG; BG := DEFAULT_COLOR_SCHEME.Additional[AddHilightAttr].BG;
@ -2225,6 +2233,7 @@ begin
end; end;
ASynEdit.Gutter.Color := fGutterColor; ASynEdit.Gutter.Color := fGutterColor;
ASynEdit.Gutter.Width := fGutterWidth; ASynEdit.Gutter.Width := fGutterWidth;
ASynEdit.Gutter.SeparatorIndex := FGutterSeparatorIndex;
if fVisibleRightMargin then if fVisibleRightMargin then
ASynEdit.RightEdge := fRightMargin ASynEdit.RightEdge := fRightMargin
else else
@ -2237,7 +2246,7 @@ begin
else else
ASynEdit.Font.Quality := fqDefault; ASynEdit.Font.Quality := fqDefault;
//debugln(['TEditorOptions.GetSynEditSettings ',ASynEdit.font.height]); //debugln(['TEditorOptions.GetSynEditSettings ',ASynEdit.font.height]);
ASynEdit.ExtraCharSpacing := fExtraCharSpacing; ASynEdit.ExtraCharSpacing := fExtraCharSpacing;
ASynEdit.ExtraLineSpacing := fExtraLineSpacing; ASynEdit.ExtraLineSpacing := fExtraLineSpacing;
ASynEdit.MaxUndo := fUndoLimit; ASynEdit.MaxUndo := fUndoLimit;
@ -2266,6 +2275,7 @@ begin
FUseCodeFolding := ASynEdit.Gutter.ShowCodeFolding; FUseCodeFolding := ASynEdit.Gutter.ShowCodeFolding;
fGutterColor := ASynEdit.Gutter.Color; fGutterColor := ASynEdit.Gutter.Color;
fGutterWidth := ASynEdit.Gutter.Width; fGutterWidth := ASynEdit.Gutter.Width;
FGutterSeparatorIndex := ASynEdit.Gutter.SeparatorIndex;
fVisibleRightMargin := ASynEdit.RightEdge>0; fVisibleRightMargin := ASynEdit.RightEdge>0;
if fVisibleRightMargin then if fVisibleRightMargin then
fRightMargin:= ASynEdit.RightEdge; fRightMargin:= ASynEdit.RightEdge;
@ -2314,7 +2324,7 @@ begin
if not (APreviewEditor is TSynEdit) then if not (APreviewEditor is TSynEdit) then
exit; exit;
ASynEdit := TSynEdit(APreviewEditor); ASynEdit := TSynEdit(APreviewEditor);
// Get real settings // Get real settings
GetSynEditSettings(ASynEdit); GetSynEditSettings(ASynEdit);

72
ide/frames/options_editor_display.lfm
View File

@ -3,22 +3,23 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
Width = 501 Width = 501
ClientHeight = 441 ClientHeight = 441
ClientWidth = 501 ClientWidth = 501
TabOrder = 0
Visible = False Visible = False
DesignLeft = 88 DesignLeft = 154
DesignTop = 116 DesignTop = 203
object MarginAndGutterGroupBox: TGroupBox[0] object MarginAndGutterGroupBox: TGroupBox[0]
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 128 Height = 122
Top = 0 Top = 0
Width = 501 Width = 501
Align = alTop Align = alTop
AutoSize = True AutoSize = True
Caption = 'MarginAndGutterGroupBox' Caption = 'MarginAndGutterGroupBox'
ClientHeight = 110 ClientHeight = 104
ClientWidth = 497 ClientWidth = 497
Ctl3D = False Ctl3D = False
TabOrder = 0 TabOrder = 0
@ -27,7 +28,7 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = RightMarginComboBox AnchorSideTop.Control = RightMarginComboBox
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 338 Left = 288
Height = 14 Height = 14
Top = 9 Top = 9
Width = 83 Width = 83
@ -41,54 +42,62 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
AnchorSideTop.Side = asrCenter AnchorSideTop.Side = asrCenter
Left = 6 Left = 6
Height = 14 Height = 14
Top = 85 Top = 79
Width = 110 Width = 110
BorderSpacing.Left = 6 BorderSpacing.Left = 6
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'Every n-th line number' Caption = 'Every n-th line number'
ParentColor = False ParentColor = False
end end
object GutterSeparatorIndexLabel: TLabel
AnchorSideLeft.Control = RightMarginLabel
AnchorSideTop.Control = GutterSeparatorIndexSpinBox
AnchorSideTop.Side = asrCenter
Left = 288
Height = 14
Top = 37
Width = 133
Caption = 'GutterSeparatorIndexLabel'
ParentColor = False
end
object VisibleRightMarginCheckBox: TCheckBox object VisibleRightMarginCheckBox: TCheckBox
AnchorSideLeft.Control = MarginAndGutterGroupBox AnchorSideLeft.Control = MarginAndGutterGroupBox
AnchorSideTop.Control = MarginAndGutterGroupBox AnchorSideTop.Control = MarginAndGutterGroupBox
Left = 6 Left = 6
Height = 19 Height = 17
Top = 6 Top = 6
Width = 159 Width = 151
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'VisibleRightMarginCheckBox' Caption = 'VisibleRightMarginCheckBox'
OnChange = GeneralCheckBoxOnChange OnChange = GeneralCheckBoxOnChange
TabOrder = 0 TabOrder = 0
UseOnChange = False
end end
object VisibleGutterCheckBox: TCheckBox object VisibleGutterCheckBox: TCheckBox
AnchorSideLeft.Control = MarginAndGutterGroupBox AnchorSideLeft.Control = MarginAndGutterGroupBox
AnchorSideTop.Control = VisibleRightMarginCheckBox AnchorSideTop.Control = VisibleRightMarginCheckBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 19 Height = 17
Top = 31 Top = 29
Width = 133 Width = 125
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'VisibleGutterCheckBox' Caption = 'VisibleGutterCheckBox'
OnChange = GeneralCheckBoxOnChange OnChange = GeneralCheckBoxOnChange
TabOrder = 1 TabOrder = 1
UseOnChange = False
end end
object ShowLineNumbersCheckBox: TCheckBox object ShowLineNumbersCheckBox: TCheckBox
AnchorSideLeft.Control = MarginAndGutterGroupBox AnchorSideLeft.Control = MarginAndGutterGroupBox
AnchorSideTop.Control = VisibleGutterCheckBox AnchorSideTop.Control = VisibleGutterCheckBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 6 Left = 6
Height = 19 Height = 17
Top = 56 Top = 52
Width = 160 Width = 152
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'ShowLineNumbersCheckBox' Caption = 'ShowLineNumbersCheckBox'
OnChange = GeneralCheckBoxOnChange OnChange = GeneralCheckBoxOnChange
OnClick = ShowLineNumbersCheckBoxClick OnClick = ShowLineNumbersCheckBoxClick
TabOrder = 2 TabOrder = 2
UseOnChange = False
end end
object RightMarginComboBox: TComboBox object RightMarginComboBox: TComboBox
AnchorSideLeft.Control = ShowOnlyLineNumbersMultiplesOfSpinEdit AnchorSideLeft.Control = ShowOnlyLineNumbersMultiplesOfSpinEdit
@ -97,7 +106,7 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
Left = 232 Left = 232
Height = 21 Height = 21
Top = 6 Top = 6
Width = 100 Width = 50
AutoComplete = False AutoComplete = False
BorderSpacing.Left = 50 BorderSpacing.Left = 50
BorderSpacing.Around = 6 BorderSpacing.Around = 6
@ -121,7 +130,7 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 122 Left = 122
Height = 23 Height = 23
Top = 81 Top = 75
Width = 54 Width = 54
BorderSpacing.Around = 6 BorderSpacing.Around = 6
MinValue = 1 MinValue = 1
@ -129,6 +138,19 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
TabOrder = 4 TabOrder = 4
Value = 1 Value = 1
end end
object GutterSeparatorIndexSpinBox: TSpinEdit
AnchorSideLeft.Control = RightMarginComboBox
AnchorSideTop.Control = RightMarginComboBox
AnchorSideTop.Side = asrBottom
Left = 232
Height = 23
Top = 33
Width = 50
MaxValue = 4
MinValue = -1
OnChange = GeneralCheckBoxOnChange
TabOrder = 5
end
end end
object EditorFontGroupBox: TGroupBox[1] object EditorFontGroupBox: TGroupBox[1]
AnchorSideLeft.Control = Owner AnchorSideLeft.Control = Owner
@ -137,7 +159,7 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 0 Left = 0
Height = 105 Height = 105
Top = 134 Top = 128
Width = 501 Width = 501
Align = alTop Align = alTop
AutoSize = True AutoSize = True
@ -303,13 +325,12 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
Left = 6 Left = 6
Height = 21 Height = 21
Top = 60 Top = 60
Width = 161 Width = 153
Anchors = [akTop, akLeft, akBottom] Anchors = [akTop, akLeft, akBottom]
BorderSpacing.Around = 6 BorderSpacing.Around = 6
Caption = 'DisableAntialiasingCheckBox' Caption = 'DisableAntialiasingCheckBox'
OnChange = GeneralCheckBoxOnChange OnChange = GeneralCheckBoxOnChange
TabOrder = 5 TabOrder = 5
UseOnChange = False
end end
end end
object DisplayPreview: TSynEdit[2] object DisplayPreview: TSynEdit[2]
@ -320,8 +341,8 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
AnchorSideBottom.Control = Owner AnchorSideBottom.Control = Owner
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 0 Left = 0
Height = 196 Height = 202
Top = 245 Top = 239
Width = 501 Width = 501
Align = alClient Align = alClient
BorderSpacing.Top = 6 BorderSpacing.Top = 6
@ -336,7 +357,10 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
TabOrder = 2 TabOrder = 2
BookMarkOptions.Xoffset = 30 BookMarkOptions.Xoffset = 30
BookMarkOptions.OnChange = nil BookMarkOptions.OnChange = nil
Gutter.RightOffset = 0
Gutter.LeftOffset = 0
Gutter.ShowCodeFolding = True Gutter.ShowCodeFolding = True
Gutter.CodeFoldingWidth = 10
Gutter.ShowChanges = True Gutter.ShowChanges = True
Gutter.ShowLineNumbers = True Gutter.ShowLineNumbers = True
Gutter.ZeroStart = False Gutter.ZeroStart = False

227
ide/frames/options_editor_display.lrs
View File

@ -3,61 +3,69 @@
LazarusResources.Add('TEditorDisplayOptionsFrame','FORMDATA',[ LazarusResources.Add('TEditorDisplayOptionsFrame','FORMDATA',[
'TPF0'#241#26'TEditorDisplayOptionsFrame'#25'EditorDisplayOptionsFrame'#6'Hei' 'TPF0'#241#26'TEditorDisplayOptionsFrame'#25'EditorDisplayOptionsFrame'#6'Hei'
+'ght'#3#185#1#5'Width'#3#245#1#12'ClientHeight'#3#185#1#11'ClientWidth'#3#245 +'ght'#3#185#1#5'Width'#3#245#1#12'ClientHeight'#3#185#1#11'ClientWidth'#3#245
+#1#7'Visible'#8#10'DesignLeft'#2'X'#9'DesignTop'#2't'#0#242#2#0#9'TGroupBox' +#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#154#0#9'DesignTop'#3#203#0#0
+#23'MarginAndGutterGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor' +#242#2#0#9'TGroupBox'#23'MarginAndGutterGroupBox'#22'AnchorSideLeft.Control'
+'SideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'Ancho' +#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'
+'rSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#128#0#3'Top'#2#0#5 +#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2
+'Width'#3#245#1#5'Align'#7#5'alTop'#8'AutoSize'#9#7'Caption'#6#23'MarginAndG' +'z'#3'Top'#2#0#5'Width'#3#245#1#5'Align'#7#5'alTop'#8'AutoSize'#9#7'Caption'
+'utterGroupBox'#12'ClientHeight'#2'n'#11'ClientWidth'#3#241#1#5'Ctl3D'#8#8'T' +#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2'h'#11'ClientWidth'#3#241#1
+'abOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'#22'AnchorSideLeft.Control'#7 +#5'Ctl3D'#8#8'TabOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'#22'AnchorSideLe'
+#19'RightMarginComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid' +'ft.Control'#7#19'RightMarginComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+'eTop.Control'#7#19'RightMarginComboBox'#18'AnchorSideTop.Side'#7#9'asrCente' +#21'AnchorSideTop.Control'#7#19'RightMarginComboBox'#18'AnchorSideTop.Side'#7
+'r'#4'Left'#3'R'#1#6'Height'#2#14#3'Top'#2#9#5'Width'#2'S'#18'BorderSpacing.' +#9'asrCenter'#4'Left'#3' '#1#6'Height'#2#14#3'Top'#2#9#5'Width'#2'S'#18'Bord'
+'Left'#2#6#7'Caption'#6#16'RightMarginLabel'#11'ParentColor'#8#0#0#6'TLabel#' +'erSpacing.Left'#2#6#7'Caption'#6#16'RightMarginLabel'#11'ParentColor'#8#0#0
+'ShowOnlyLineNumbersMultiplesOfLabel'#22'AnchorSideLeft.Control'#7#23'Margin' +#6'TLabel#ShowOnlyLineNumbersMultiplesOfLabel'#22'AnchorSideLeft.Control'#7
+'AndGutterGroupBox'#21'AnchorSideTop.Control'#7'&ShowOnlyLineNumbersMultiple' +#23'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7'&ShowOnlyLineNumber'
+'sOfSpinEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2 +'sMultiplesOfSpinEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'H'
+#14#3'Top'#2'U'#5'Width'#2'n'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.To' +'eight'#2#14#3'Top'#2'O'#5'Width'#2'n'#18'BorderSpacing.Left'#2#6#17'BorderS'
+'p'#2#6#7'Caption'#6#22'Every n-th line number'#11'ParentColor'#8#0#0#9'TChe' +'pacing.Top'#2#6#7'Caption'#6#22'Every n-th line number'#11'ParentColor'#8#0
+'ckBox'#26'VisibleRightMarginCheckBox'#22'AnchorSideLeft.Control'#7#23'Margi' +#0#6'TLabel'#25'GutterSeparatorIndexLabel'#22'AnchorSideLeft.Control'#7#16'R'
+'nAndGutterGroupBox'#21'AnchorSideTop.Control'#7#23'MarginAndGutterGroupBox' +'ightMarginLabel'#21'AnchorSideTop.Control'#7#27'GutterSeparatorIndexSpinBox'
+#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#159#0#20'BorderSpacing.Aro' +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3' '#1#6'Height'#2#14#3'Top'#2
+'und'#2#6#7'Caption'#6#26'VisibleRightMarginCheckBox'#8'OnChange'#7#23'Gener' +'%'#5'Width'#3#133#0#7'Caption'#6#25'GutterSeparatorIndexLabel'#11'ParentCol'
+'alCheckBoxOnChange'#8'TabOrder'#2#0#11'UseOnChange'#8#0#0#9'TCheckBox'#21'V' +'or'#8#0#0#9'TCheckBox'#26'VisibleRightMarginCheckBox'#22'AnchorSideLeft.Con'
+'isibleGutterCheckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupB' +'trol'#7#23'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7#23'MarginAn'
+'ox'#21'AnchorSideTop.Control'#7#26'VisibleRightMarginCheckBox'#18'AnchorSid' +'dGutterGroupBox'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#3#151#0#20
+'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#31#5'Width'#3 +'BorderSpacing.Around'#2#6#7'Caption'#6#26'VisibleRightMarginCheckBox'#8'OnC'
+#133#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'VisibleGutterCheckBox'#8 +'hange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#21'Vi'
+'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#11'UseOnChange'#8#0 +'sibleGutterCheckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupBo'
+#0#9'TCheckBox'#23'ShowLineNumbersCheckBox'#22'AnchorSideLeft.Control'#7#23 +'x'#21'AnchorSideTop.Control'#7#26'VisibleRightMarginCheckBox'#18'AnchorSide'
+'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7#21'VisibleGutterCheckB' +'Top.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#29#5'Width'#2
+'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top' +'}'#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'VisibleGutterCheckBox'#8'On'
+#2'8'#5'Width'#3#160#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'ShowLine' +'Change'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#23'S'
+'NumbersCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7#28 +'howLineNumbersCheckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGrou'
+'ShowLineNumbersCheckBoxClick'#8'TabOrder'#2#2#11'UseOnChange'#8#0#0#9'TComb' +'pBox'#21'AnchorSideTop.Control'#7#21'VisibleGutterCheckBox'#18'AnchorSideTo'
+'oBox'#19'RightMarginComboBox'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNum' +'p.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'4'#5'Width'#3#152
+'bersMultiplesOfSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSi' +#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'ShowLineNumbersCheckBox'#8'O'
+'deTop.Control'#7#23'MarginAndGutterGroupBox'#4'Left'#3#232#0#6'Height'#2#21 +'nChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7#28'ShowLineNumbersCheck'
+#3'Top'#2#6#5'Width'#2'd'#12'AutoComplete'#8#18'BorderSpacing.Left'#2'2'#20 +'BoxClick'#8'TabOrder'#2#2#0#0#9'TComboBox'#19'RightMarginComboBox'#22'Ancho'
+'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1 +'rSideLeft.Control'#7'&ShowOnlyLineNumbersMultiplesOfSpinEdit'#19'AnchorSide'
+#6#2'80'#6#2'78'#6#2'76'#0#9'ItemWidth'#2#0#8'OnChange'#7#16'ComboboxOnChang' +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'MarginAndGutterGro'
+'e'#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'Ta' +'upBox'#4'Left'#3#232#0#6'Height'#2#21#3'Top'#2#6#5'Width'#2'2'#12'AutoCompl'
+'bOrder'#2#3#0#0#9'TSpinEdit&ShowOnlyLineNumbersMultiplesOfSpinEdit'#22'Anch' +'ete'#8#18'BorderSpacing.Left'#2'2'#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8
+'orSideLeft.Control'#7'#ShowOnlyLineNumbersMultiplesOfLabel'#19'AnchorSideLe' +#10'ItemHeight'#2#13#13'Items.Strings'#1#6#2'80'#6#2'78'#6#2'76'#0#9'ItemWid'
+'ft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'ShowLineNumbersCheck' +'th'#2#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboboxOnExit'#9
+'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Height'#2#23#3'To' +'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#9'TSpinEdit&ShowOnly'
+'p'#2'Q'#5'Width'#2'6'#20'BorderSpacing.Around'#2#6#8'MinValue'#2#1#8'OnChan' +'LineNumbersMultiplesOfSpinEdit'#22'AnchorSideLeft.Control'#7'#ShowOnlyLineN'
+'ge'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#4#5'Value'#2#1#0#0#0#242#2#1 +'umbersMultiplesOfLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+#9'TGroupBox'#18'EditorFontGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21 +'eTop.Control'#7#23'ShowLineNumbersCheckBox'#18'AnchorSideTop.Side'#7#9'asrB'
+'AnchorSideTop.Control'#7#23'MarginAndGutterGroupBox'#23'AnchorSideRight.Con' +'ottom'#4'Left'#2'z'#6'Height'#2#23#3'Top'#2'K'#5'Width'#2'6'#20'BorderSpaci'
+'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Heig' +'ng.Around'#2#6#8'MinValue'#2#1#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8
+'ht'#2'i'#3'Top'#3#134#0#5'Width'#3#245#1#5'Align'#7#5'alTop'#8'AutoSize'#9 +'TabOrder'#2#4#5'Value'#2#1#0#0#9'TSpinEdit'#27'GutterSeparatorIndexSpinBox'
+#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'EditorFontGroupBox'#12'ClientHeig' +#22'AnchorSideLeft.Control'#7#19'RightMarginComboBox'#21'AnchorSideTop.Contr'
+'ht'#2'W'#11'ClientWidth'#3#241#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#6'TLabel'#21 +'ol'#7#19'RightMarginComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+#3#232#0#6'Height'#2#23#3'Top'#2'!'#5'Width'#2'2'#8'MaxValue'#2#4#8'MinValue'
+#2#255#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#5#0#0#0#242#2
+#1#9'TGroupBox'#18'EditorFontGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'
+#21'AnchorSideTop.Control'#7#23'MarginAndGutterGroupBox'#23'AnchorSideRight.'
+'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'H'
+'eight'#2'i'#3'Top'#3#128#0#5'Width'#3#245#1#5'Align'#7#5'alTop'#8'AutoSize'
+#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'EditorFontGroupBox'#12'ClientHe'
+'ight'#2'W'#11'ClientWidth'#3#241#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#6'TLabel'#21
+'EditorFontHeightLabel'#22'AnchorSideLeft.Control'#7#24'EditorFontHeightComb' +'EditorFontHeightLabel'#22'AnchorSideLeft.Control'#7#24'EditorFontHeightComb'
+'oBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24 +'oBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24
+'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p' +'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p'
+#6'Height'#2#14#3'Top'#2'$'#5'Width'#2'k'#20'BorderSpacing.Around'#2#6#7'Cap' ,#6'Height'#2#14#3'Top'#2'$'#5'Width'#2'k'#20'BorderSpacing.Around'#2#6#7'Cap'
+'tion'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraL' +'tion'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraL'
+'ineSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraLineSpacingComboBox' +'ineSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraLineSpacingComboBox'
+#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'Extra' +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'Extra'
@ -65,7 +73,7 @@ LazarusResources.Add('TEditorDisplayOptionsFrame','FORMDATA',[
+'Height'#2#14#3'Top'#2'$'#5'Width'#2'l'#20'BorderSpacing.Around'#2#6#7'Capti' +'Height'#2#14#3'Top'#2'$'#5'Width'#2'l'#20'BorderSpacing.Around'#2#6#7'Capti'
+'on'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraCha' +'on'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraCha'
+'rSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraCharSpacingComboBox'#19 +'rSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraCharSpacingComboBox'#19
,'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'ExtraCha' +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'ExtraCha'
+'rSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'_'#1#6'He' +'rSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'_'#1#6'He'
+'ight'#2#14#3'Top'#2'?'#5'Width'#2'p'#20'BorderSpacing.Around'#2#6#7'Caption' +'ight'#2#14#3'Top'#2'?'#5'Width'#2'p'#20'BorderSpacing.Around'#2#6#7'Caption'
+#6#21'ExtraCharSpacingLabel'#11'ParentColor'#8#0#0#9'TComboBox'#18'EditorFon' +#6#21'ExtraCharSpacingLabel'#11'ParentColor'#8#0#0#9'TComboBox'#18'EditorFon'
@ -105,62 +113,63 @@ LazarusResources.Add('TEditorDisplayOptionsFrame','FORMDATA',[
+'own'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#9'TCheckBox'#27'DisableAnt' +'own'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#9'TCheckBox'#27'DisableAnt'
+'ialiasingCheckBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'A' +'ialiasingCheckBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'A'
+'nchorSideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side' +'nchorSideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'
+#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'<'#5'Width'#3#161#0#7'An' +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'<'#5'Width'#3#153#0#7'An'
+'chors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'C' +'chors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'C'
+'aption'#6#27'DisableAntialiasingCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO' +'aption'#6#27'DisableAntialiasingCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO'
+'nChange'#8'TabOrder'#2#5#11'UseOnChange'#8#0#0#0#242#2#2#8'TSynEdit'#14'Dis' +'nChange'#8'TabOrder'#2#5#0#0#0#242#2#2#8'TSynEdit'#14'DisplayPreview'#22'An'
+'playPreview'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control' +'chorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#18'EditorFontG'
+#7#18'EditorFontGroupBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi' +'roupBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc' +'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
+'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#196#0#3'Top'#3 +#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#202#0#3'Top'#3#239#0#5'Width'#3#245#1
+#245#0#5'Width'#3#245#1#5'Align'#7#8'alClient'#17'BorderSpacing.Top'#2#6#18 +#5'Align'#7#8'alClient'#17'BorderSpacing.Top'#2#6#18'CFDividerDrawLevel'#2#0
+'CFDividerDrawLevel'#2#0#5'Ctl3D'#8#11'Font.Height'#2#240#9'Font.Name'#6#7'c' +#5'Ctl3D'#8#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7
+'ourier'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased' +#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentColor'#8#10'Par'
+#11'ParentColor'#8#10'ParentFont'#8#8'TabOrder'#2#2#23'BookMarkOptions.Xoffs' +'entFont'#8#8'TabOrder'#2#2#23'BookMarkOptions.Xoffset'#2#30#24'BookMarkOpti'
+'et'#2#30#24'BookMarkOptions.OnChange'#13#22'Gutter.ShowCodeFolding'#9#18'Gu' +'ons.OnChange'#13#18'Gutter.RightOffset'#2#0#17'Gutter.LeftOffset'#2#0#22'Gu'
+'tter.ShowChanges'#9#22'Gutter.ShowLineNumbers'#9#16'Gutter.ZeroStart'#8#10 +'tter.ShowCodeFolding'#9#23'Gutter.CodeFoldingWidth'#2#10#18'Gutter.ShowChan'
+'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'Shor' +'ges'#9#22'Gutter.ShowLineNumbers'#9#16'Gutter.ZeroStart'#8#10'Keystrokes'#14
+'tCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'S' +#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1
+'hortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8 ,#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1
+'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'S' +#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0
+'hortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'S' +#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1
+'hortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'S' +#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+'hortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8 +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8 +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8 +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'S' +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
,'hortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8 +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'S' +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+'hortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8 +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'S' +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+'hortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8 +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201 +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3 +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman' +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7 +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8 +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1 +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3 +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma' +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7 +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0 +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X' +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC' +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S' +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1 +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3 +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman' +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C' +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1 +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`' +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3 +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu' +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh' +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1 +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3 +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm' +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7 +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`' +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+#0#0#13'Lines.Strings'#1#6#14'DisplayPreview'#0#8'ReadOnly'#9#21'BracketHigh' +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#14
+'lightStyle'#7#8'sbhsBoth'#0#0#0 +'DisplayPreview'#0#8'ReadOnly'#9#21'BracketHighlightStyle'#7#8'sbhsBoth'#0#0
+#0
]); ]);

6
ide/frames/options_editor_display.pas
View File

@ -45,12 +45,14 @@ type
ExtraCharSpacingLabel: TLabel; ExtraCharSpacingLabel: TLabel;
ExtraLineSpacingComboBox: TComboBox; ExtraLineSpacingComboBox: TComboBox;
ExtraLineSpacingLabel: TLabel; ExtraLineSpacingLabel: TLabel;
GutterSeparatorIndexLabel: TLabel;
MarginAndGutterGroupBox: TGroupBox; MarginAndGutterGroupBox: TGroupBox;
RightMarginComboBox: TComboBox; RightMarginComboBox: TComboBox;
RightMarginLabel: TLabel; RightMarginLabel: TLabel;
ShowLineNumbersCheckBox: TCheckBox; ShowLineNumbersCheckBox: TCheckBox;
ShowOnlyLineNumbersMultiplesOfLabel: TLabel; ShowOnlyLineNumbersMultiplesOfLabel: TLabel;
ShowOnlyLineNumbersMultiplesOfSpinEdit: TSpinEdit; ShowOnlyLineNumbersMultiplesOfSpinEdit: TSpinEdit;
GutterSeparatorIndexSpinBox: TSpinEdit;
VisibleGutterCheckBox: TCheckBox; VisibleGutterCheckBox: TCheckBox;
VisibleRightMarginCheckBox: TCheckBox; VisibleRightMarginCheckBox: TCheckBox;
procedure EditorFontButtonClick(Sender: TObject); procedure EditorFontButtonClick(Sender: TObject);
@ -205,6 +207,7 @@ begin
PreviewEdits[a].Gutter.Visible := VisibleGutterCheckBox.Checked; PreviewEdits[a].Gutter.Visible := VisibleGutterCheckBox.Checked;
PreviewEdits[a].Gutter.ShowLineNumbers := ShowLineNumbersCheckBox.Checked; PreviewEdits[a].Gutter.ShowLineNumbers := ShowLineNumbersCheckBox.Checked;
PreviewEdits[a].Gutter.ShowOnlyLineNumbersMultiplesOf := ShowOnlyLineNumbersMultiplesOfSpinEdit.Value; PreviewEdits[a].Gutter.ShowOnlyLineNumbersMultiplesOf := ShowOnlyLineNumbersMultiplesOfSpinEdit.Value;
PreviewEdits[a].Gutter.SeparatorIndex := GutterSeparatorIndexSpinBox.Value;
if VisibleRightMarginCheckBox.Checked then if VisibleRightMarginCheckBox.Checked then
PreviewEdits[a].RightEdge := StrToIntDef(RightMarginComboBox.Text, 80) PreviewEdits[a].RightEdge := StrToIntDef(RightMarginComboBox.Text, 80)
else else
@ -241,6 +244,7 @@ begin
VisibleGutterCheckBox.Caption := dlgVisibleGutter; VisibleGutterCheckBox.Caption := dlgVisibleGutter;
ShowLineNumbersCheckBox.Caption := dlgShowLineNumbers; ShowLineNumbersCheckBox.Caption := dlgShowLineNumbers;
ShowOnlyLineNumbersMultiplesOfLabel.Caption := lisEveryNThLineNumber; ShowOnlyLineNumbersMultiplesOfLabel.Caption := lisEveryNThLineNumber;
GutterSeparatorIndexLabel.Caption := dlgGutterSeparatorIndex;
RightMarginLabel.Caption := dlgRightMargin; RightMarginLabel.Caption := dlgRightMargin;
EditorFontGroupBox.Caption := dlgDefaultEditorFont; EditorFontGroupBox.Caption := dlgDefaultEditorFont;
EditorFontHeightLabel.Caption := dlgEditorFontHeight; EditorFontHeightLabel.Caption := dlgEditorFontHeight;
@ -260,6 +264,7 @@ begin
VisibleGutterCheckBox.Checked := VisibleGutter; VisibleGutterCheckBox.Checked := VisibleGutter;
ShowLineNumbersCheckBox.Checked := ShowLineNumbers; ShowLineNumbersCheckBox.Checked := ShowLineNumbers;
ShowOnlyLineNumbersMultiplesOfSpinEdit.Value := ShowOnlyLineNumbersMultiplesOf; ShowOnlyLineNumbersMultiplesOfSpinEdit.Value := ShowOnlyLineNumbersMultiplesOf;
GutterSeparatorIndexSpinBox.Value := GutterSeparatorIndex;
VisibleRightMarginCheckBox.Checked := VisibleRightMargin; VisibleRightMarginCheckBox.Checked := VisibleRightMargin;
SetComboBoxText(RightMarginComboBox, IntToStr(RightMargin)); SetComboBoxText(RightMarginComboBox, IntToStr(RightMargin));
SetComboBoxText(EditorFontComboBox, EditorFont); SetComboBoxText(EditorFontComboBox, EditorFont);
@ -281,6 +286,7 @@ begin
VisibleGutter := VisibleGutterCheckBox.Checked; VisibleGutter := VisibleGutterCheckBox.Checked;
ShowLineNumbers := ShowLineNumbersCheckBox.Checked; ShowLineNumbers := ShowLineNumbersCheckBox.Checked;
ShowOnlyLineNumbersMultiplesOf := ShowOnlyLineNumbersMultiplesOfSpinEdit.Value; ShowOnlyLineNumbersMultiplesOf := ShowOnlyLineNumbersMultiplesOfSpinEdit.Value;
GutterSeparatorIndex := GutterSeparatorIndexSpinBox.Value;
VisibleRightMargin := VisibleRightMarginCheckBox.Checked; VisibleRightMargin := VisibleRightMarginCheckBox.Checked;
RightMargin := StrToIntDef(RightMarginComboBox.Text, 80); RightMargin := StrToIntDef(RightMarginComboBox.Text, 80);
EditorFont := EditorFontComboBox.Text; EditorFont := EditorFontComboBox.Text;

1
ide/lazarusidestrconsts.pas
View File

@ -1149,6 +1149,7 @@ resourcestring
dlgMarginGutter = 'Margin and gutter'; dlgMarginGutter = 'Margin and gutter';
dlgVisibleRightMargin = 'Visible right margin'; dlgVisibleRightMargin = 'Visible right margin';
dlgVisibleGutter = 'Visible gutter'; dlgVisibleGutter = 'Visible gutter';
dlgGutterSeparatorIndex = 'Gutter separator index';
dlgShowLineNumbers = 'Show line numbers'; dlgShowLineNumbers = 'Show line numbers';
dlgShowCompilingLineNumbers = 'Show line numbers'; dlgShowCompilingLineNumbers = 'Show line numbers';
dlgRightMargin = 'Right margin'; dlgRightMargin = 'Right margin';