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

SynEdit: Ifdef Markup: EditorOptions (still in ifdef)

Browse Source 
git-svn-id: trunk@41219 -
This commit is contained in:
martin 2013-05-16 00:01:52 +00:00
parent 222d915b0f
commit 82e965f5ef
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ide/editoroptions.pp
View File

@ -59,7 +59,7 @@ uses
SynHighlighterPas, SynHighlighterPerl, SynHighlighterPHP, SynHighlighterSQL,
SynHighlighterPython, SynHighlighterUNIXShellScript, SynHighlighterXML,
SynHighlighterJScript, SynHighlighterDiff, SynHighlighterBat, SynHighlighterIni,
SynHighlighterPo,
SynHighlighterPo, SynEditMarkupIfDef,
// codetools
LinkScanner, CodeToolManager,
// IDEIntf
@ -99,7 +99,11 @@ type
ahaTemplateEditOther, ahaSyncroEditCur, ahaSyncroEditSync,
ahaSyncroEditOther, ahaSyncroEditArea, ahaGutterSeparator,
ahaGutter, ahaRightMargin, ahaSpecialVisibleChars,
ahaTopInfoHint);
ahaTopInfoHint
{$IFDEF WithSynMarkupIfDef}
, ahaIfDefBlockInactive
{$ENDIF}
);
TAhaGroupName = (agnDefault, agnLanguage, agnText, agnLine, agnGutter, agnTemplateMode, agnSyncronMode);
@ -135,7 +139,10 @@ const
'', // ahaGutter
'', // ahaRightMargin
'', // ahaSpecialVisibleChars
'' // ahaTopInfoHint
'' // ahaTopInfoHint
{$IFDEF WithSynMarkupIfDef}
, ''
{$ENDIF}
);
ahaGroupMap: array[TAdditionalHilightAttribute] of TAhaGroupName = (
@ -169,7 +176,11 @@ const
{ ahaGutter } agnGutter,
{ ahaRightMargin} agnGutter,
{ ahaSpecialVisibleChars } agnText,
{ ahaTopInfoHint } agnLine
{ ahaTopInfoHint } agnLine
{$IFDEF WithSynMarkupIfDef}
,
{ ahaIfDefBlockInactive } agnText
{$ENDIF}
);
ahaSupportedFeatures: array[TAdditionalHilightAttribute] of TColorSchemeAttributeFeatures =
(
@ -203,7 +214,11 @@ const
{ ahaGutter } [hafBackColor],
{ ahaRightMargin} [hafForeColor],
{ ahaSpecialVisibleChars }[hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
{ ahaTopInfoHint } [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask]
{ ahaTopInfoHint } [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask]
{$IFDEF WithSynMarkupIfDef}
,
{ ahaIfDefBlockInactive } [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask]
{$ENDIF}
);
@ -2471,6 +2486,9 @@ begin
AdditionalHighlightAttributes[ahaRightMargin] := dlgRightMargin;
AdditionalHighlightAttributes[ahaSpecialVisibleChars] := dlgAddHiSpecialVisibleChars;
AdditionalHighlightAttributes[ahaTopInfoHint] := dlgTopInfoHint;
{$IFDEF WithSynMarkupIfDef}
AdditionalHighlightAttributes[ahaIfDefBlockInactive] := dlgIfDefBlockInactive;
{$ENDIF}
AdditionalHighlightGroupNames[agnDefault] := dlgAddHiAttrGroupDefault;
AdditionalHighlightGroupNames[agnText] := dlgAddHiAttrGroupText;
@ -6139,11 +6157,15 @@ begin
SetMarkupColorByClass(ahaHighlightWord, TSynEditMarkupHighlightAllCaret);
SetMarkupColorByClass(ahaWordGroup, TSynEditMarkupWordGroup);
SetMarkupColorByClass(ahaSpecialVisibleChars, TSynEditMarkupSpecialChar);
{$IFDEF WithSynMarkupIfDef}
SetMarkupColorByClass(ahaIfDefBlockInactive, TSynEditMarkupIfDef);
{$ENDIF}
SetGutterColorByClass(ahaLineNumber, TSynGutterLineNumber);
SetGutterColorByClass(ahaModifiedLine, TSynGutterChanges);
SetGutterColorByClass(ahaCodeFoldingTree, TSynGutterCodeFolding);
SetGutterColorByClass(ahaGutterSeparator, TSynGutterSeparator);
i := aSynEdit.PluginCount - 1;
while (i >= 0) and not(aSynEdit.Plugin[i] is TSynPluginTemplateEdit) do
dec(i);

1
ide/lazarusidestrconsts.pas
View File

@ -1831,6 +1831,7 @@ resourcestring
dlgAddHiAttrGutterSeparator = 'Gutter Separator';
dlgAddHiSpecialVisibleChars = 'Visualized Special Chars';
dlgTopInfoHint = 'Current Class/Proc Hint';
dlgIfDefBlockInactive = 'Inactive $IFDEF code';
dlgAddHiAttrGroupDefault = 'Global';
dlgAddHiAttrGroupText = 'Text';