IDE, EditorOptions: Moved to ColorSchemFactory / Added Export for ColorScheme / Added UserSchemes

git-svn-id: trunk@25626 -
This commit is contained in:
martin 2010-05-25 00:43:06 +00:00
parent c71ccb5390
commit 084a15c640
16 changed files with 2767 additions and 1671 deletions

6
.gitattributes vendored
View File

@ -3312,6 +3312,11 @@ examples/xmlstreaming/mainunit.lrs svneol=native#text/pascal
examples/xmlstreaming/mainunit.pas svneol=native#text/plain
examples/xmlstreaming/streamasxmldemo.lpi svneol=native#text/plain
examples/xmlstreaming/streamasxmldemo.lpr svneol=native#text/plain
ide/ColorDefault.xml svneol=native#text/xml
ide/ColorDelphi.xml svneol=native#text/xml
ide/ColorOcean.xml svneol=native#text/xml
ide/ColorPascalClassic.xml svneol=native#text/xml
ide/ColorTwilight.xml svneol=native#text/xml
ide/Makefile svneol=native#text/plain
ide/Makefile.fpc svneol=native#text/plain
ide/aboutfrm.lfm svneol=native#text/plain
@ -3379,6 +3384,7 @@ ide/editdefinetree.pas svneol=native#text/pascal
ide/editmsgscannersdlg.lfm svneol=native#text/plain
ide/editmsgscannersdlg.pas svneol=native#text/plain
ide/editoroptions.pp svneol=native#text/pascal
ide/editoroptions.rc svneol=native#text/plain
ide/emptymethodsdlg.lfm svneol=native#text/plain
ide/emptymethodsdlg.pas svneol=native#text/plain
ide/encloseselectiondlg.lfm svneol=native#text/plain

View File

@ -3713,15 +3713,8 @@ begin
FillChar(TokenAccu,SizeOf(TokenAccu),0);
//DebugLn('TCustomSynEdit.PaintTextLines ',DbgSName(Self),' TopLine=',dbgs(TopLine),' AClip=',dbgs(AClip));
colEditorBG := Color;
if Assigned(fHighlighter) then begin
if Assigned(fHighlighter) then
fHighlighter.CurrentLines := FTheLinesView;
if Assigned(Highlighter.WhitespaceAttribute) then
begin
colBG := Highlighter.WhitespaceAttribute.Background;
if colBG <> clNone then
colEditorBG := colBG;
end;
end;
// If the right edge is visible and in the invalid area, prepare to paint it.
// Do this first to realize the pen when getting the dc variable.
bDoRightEdge := FALSE;

View File

@ -125,6 +125,8 @@ type
function SaveToRegistry(Reg: TBetterRegistry): boolean;
function LoadFromFile(Ini : TIniFile): boolean;
function SaveToFile(Ini : TIniFile): boolean;
procedure IncChangeLock;
procedure DecChangeLock;
public
property IntegerStyle: integer read GetStyleFromInt write SetStyleFromInt;
property IntegerStyleMask: integer read GetStyleMaskFromInt write SetStyleMaskFromInt;
@ -139,9 +141,9 @@ type
stored GetForegroundColorStored;
property FrameColor: TColor read FFrameColor write SetFrameColor
stored GetFrameColorStored;
property Style: TFontStyles read fStyle write SetStyle //default [];
property Style: TFontStyles read fStyle write SetStyle
stored GetFontStyleStored;
property StyleMask: TFontStyles read fStyleMask write SetStyleMask //default [];
property StyleMask: TFontStyles read fStyleMask write SetStyleMask
stored GetFontStyleMaskStored;
end;
@ -479,10 +481,11 @@ var
src: TSynHighlighterAttributes;
begin
if Source is TSynHighlighterAttributes then begin
inc(FChangeLock);
IncChangeLock;
try
src := Source as TSynHighlighterAttributes;
FName := src.FName;
FStoredName:= src.FStoredName;
Background := src.FBackground;
Foreground := src.fForeground;
FrameColor := src.FFrameColor;
@ -490,9 +493,7 @@ begin
StyleMask := src.fStyleMask;
FFeatures := src.FFeatures;
finally
dec(FChangeLock);
if FIsChanged then
Changed;
DecChangeLock;
end;
end else
inherited Assign(Source);
@ -515,6 +516,9 @@ begin
Background := clNone;
Foreground := clNone;
FFrameColor := clNone;
FBackgroundDefault := clNone;
FForegroundDefault := clNone;
FFrameColorDefault := clNone;
FFeatures := [hafBackColor, hafForeColor, hafFrameColor, hafStyle];
fName := attribName;
if aStoredName = '' then
@ -549,6 +553,8 @@ begin
end;
procedure TSynHighlighterAttributes.InternalSaveDefaultValues;
(* Called once from TSynCustomHighlighter.Create (and only from there),
after all Attributes where created *)
begin
fForegroundDefault := fForeground;
fBackgroundDefault := fBackground;
@ -840,6 +846,18 @@ begin
Result := true;
end;
procedure TSynHighlighterAttributes.IncChangeLock;
begin
inc(FChangeLock);
end;
procedure TSynHighlighterAttributes.DecChangeLock;
begin
dec(FChangeLock);
if (FChangeLock = 0) and FIsChanged then
Changed;
end;
function TSynHighlighterAttributes.GetStyleFromInt: integer;
begin
if fsBold in Style then Result:= 1 else Result:= 0;
@ -1197,6 +1215,8 @@ begin
end;
procedure TSynCustomHighlighter.SetAttributesOnChange(AEvent: TNotifyEvent);
(* Called once from TSynCustomHighlighter.Create (and only from there),
after all Attributes where created *)
var
i: integer;
Attri: TSynHighlighterAttributes;

197
ide/ColorDefault.xml Normal file
View File

@ -0,0 +1,197 @@
<?xml version="1.0"?>
<CONFIG>
<Lazarus>
<ColorSchemes>
<Names Count="1">
<Item1 Value="Default"/>
</Names>
<Globals Version="6">
<SchemeDefault>
<ahaDefault Background="clWhite" Foreground="clBlack"/>
<ahaTextBlock Background="clNavy" Foreground="clWhite"/>
<ahaExecutionPoint Background="clGray" Foreground="clWhite"/>
<ahaEnabledBreakpoint Background="clRed" Foreground="clBlack"/>
<ahaDisabledBreakpoint Background="clGreen" Foreground="clBlack"/>
<ahaInvalidBreakpoint Background="clOlive" Foreground="clGreen"/>
<ahaUnknownBreakpoint Background="clRed" Foreground="clBlack"/>
<ahaErrorLine Background="5284095" Foreground="clBlack"/>
<ahaIncrementalSearch Background="3199088" Foreground="clWhite"/>
<ahaHighlightAll Background="clYellow"/>
<ahaBracketMatch Style="fsBold"/>
<ahaMouseLink Foreground="clBlue"/>
<ahaModifiedLine Foreground="clGreen" FrameColor="59900"/>
<ahaCodeFoldingTree Background="clWhite" Foreground="clSilver"/>
<ahaHighlightWord Background="15132390" FrameColor="clSilver"/>
<ahaFoldedCode Background="clWhite" Foreground="clSilver" FrameColor="clSilver"/>
<ahaWordGroup FrameColor="clRed"/>
<ahaTemplateEditCur FrameColor="clAqua"/>
<ahaTemplateEditSync FrameColor="clFuchsia"/>
<ahaTemplateEditOther FrameColor="clMaroon"/>
<ahaSyncroEditCur FrameColor="clFuchsia"/>
<ahaSyncroEditSync FrameColor="clRed"/>
<ahaSyncroEditOther FrameColor="9744532"/>
<ahaSyncroEditArea Background="clMoneyGreen"/>
<ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
<ahaGutter Background="clBtnFace"/>
<ahaRightMargin Foreground="clSilver"/>
</SchemeDefault>
</Globals>
<LangObjectPascal Version="6">
<SchemeDefault>
<Assembler Foreground="clGreen"/>
<Comment Foreground="clBlue" Style="fsBold"/>
<Directive Foreground="clRed" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Reserved_word Style="fsBold"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangObjectPascal>
<LangLazarus_Form_definition Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Key Style="fsBold"/>
<Number Foreground="clNavy"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangLazarus_Form_definition>
<LangXML_document Version="6">
<SchemeDefault>
<Attribute_Name Foreground="clMaroon"/>
<Attribute_Value Foreground="clNavy" Style="fsBold"/>
<CDATA_Section Foreground="clOlive" Style="fsItalic"/>
<Comment Foreground="clBlue" Style="fsBold"/>
<DOCTYPE_Section Foreground="clBlue" Style="fsItalic"/>
<Element_Name Foreground="clMaroon" Style="fsBold"/>
<Entity_Reference Foreground="clBlue" Style="fsBold"/>
<Namespace_Attribute_Name Foreground="clRed"/>
<Namespace_Attribute_Value Foreground="clRed" Style="fsBold"/>
<Processing_Instruction Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
<Text Foreground="clBlack" Style="fsBold"/>
</SchemeDefault>
</LangXML_document>
<LangHTML_document Version="6">
<SchemeDefault>
<Asp Background="clYellow" Foreground="clBlack"/>
<Comment Foreground="clBlue" Style="fsBold"/>
<Escape_ampersand Foreground="clLime" Style="fsBold"/>
<Identifier Style="fsBold"/>
<Reserved_word Style="fsBold"/>
<Symbol Foreground="clRed"/>
<Unknown_word Foreground="clRed" Style="fsBold"/>
<Value Foreground="16744448"/>
</SchemeDefault>
</LangHTML_document>
<LangC__ Version="6">
<SchemeDefault>
<Assembler Foreground="clGreen"/>
<Comment Foreground="clBlue" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Preprocessor Foreground="clBlue" Style="fsBold"/>
<Reserved_word Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangC__>
<LangPerl Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Pragma Style="fsBold"/>
<Reserved_word Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
<Variable Style="fsBold"/>
</SchemeDefault>
</LangPerl>
<LangJava Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Documentation Foreground="clBlue" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Reserved_word Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangJava>
<LangUNIX_Shell_Script Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Reserved_word Style="fsBold"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
<Variable Foreground="clPurple"/>
</SchemeDefault>
</LangUNIX_Shell_Script>
<LangPython Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Documentation Foreground="clBlue" Style="fsBold"/>
<Float Foreground="clBlue"/>
<Hexadecimal Foreground="clBlue"/>
<Non_reserved_keyword Foreground="clNavy" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Octal Foreground="clBlue"/>
<Reserved_word Style="fsBold"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
<SyntaxError Foreground="clRed"/>
<System_functions_and_variables Style="fsBold"/>
</SchemeDefault>
</LangPython>
<LangPHP Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Reserved_word Style="fsBold"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangPHP>
<LangSQL Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Data_type Style="fsBold"/>
<Default_packages Style="fsBold"/>
<Exception Style="fsItalic"/>
<Function Style="fsBold"/>
<Number Foreground="clNavy"/>
<Reserved_word Style="fsBold"/>
<Reserved_word__PL_SQL_ Style="fsBold"/>
<SQL_Plus_command Style="fsBold"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangSQL>
<LangJavascript Version="6">
<SchemeDefault>
<Comment Foreground="clBlue" Style="fsBold"/>
<Number Foreground="clNavy"/>
<Reserved_word Style="fsBold"/>
<String Foreground="clBlue"/>
<Symbol Foreground="clRed"/>
</SchemeDefault>
</LangJavascript>
<LangDiff_File Version="6">
<SchemeDefault>
<Diff_Added_line Foreground="clGreen"/>
<Diff_Changed_Line Foreground="clPurple"/>
<Diff_Chunk_Line_Counts Foreground="clPurple" Style="fsBold"/>
<Diff_Chunk_Marker Style="fsBold"/>
<Diff_Chunk_New_Line_Count Foreground="clGreen" Style="fsBold"/>
<Diff_Chunk_Original_Line_Count Foreground="clRed" Style="fsBold"/>
<Diff_New_File Background="clGreen" Style="fsBold"/>
<Diff_Original_File Background="clRed" Style="fsBold"/>
<Diff_Removed_Line Foreground="clRed"/>
<Unknown_word Style="fsItalic"/>
</SchemeDefault>
</LangDiff_File>
</ColorSchemes>
</Lazarus>
</CONFIG>

186
ide/ColorDelphi.xml Normal file
View File

@ -0,0 +1,186 @@
<?xml version="1.0"?>
<CONFIG>
<Lazarus>
<ColorSchemes>
<Names Count="1">
<Item1 Value="Delphi"/>
</Names>
<Globals Version="6">
<SchemeDelphi>
<ahaTextBlock Background="10841427" Foreground="clWhite"/>
<ahaExecutionPoint Background="10066380" Foreground="clBlack"/>
<ahaEnabledBreakpoint Background="16762823" Foreground="clBlack"/>
<ahaDisabledBreakpoint Background="16762823" Foreground="clGray"/>
<ahaInvalidBreakpoint Background="clGreen" Foreground="clWhite"/>
<ahaUnknownBreakpoint Background="16762823" Foreground="clBlack"/>
<ahaErrorLine Background="clRed" Foreground="clWhite"/>
<ahaIncrementalSearch Background="clBlack" Foreground="16580045"/>
<ahaHighlightAll Background="clYellow"/>
<ahaBracketMatch Background="clAqua" FrameColor="13421782"/>
<ahaMouseLink Foreground="clBlue"/>
<ahaLineNumber Background="16053492" Foreground="13408665"/>
<ahaLineHighlight Background="15138810"/>
<ahaModifiedLine Background="16053492" Foreground="clLime" FrameColor="clYellow"/>
<ahaCodeFoldingTree Background="16053492" Foreground="13408665"/>
<ahaHighlightWord FrameColor="13421782"/>
<ahaFoldedCode Foreground="13408665" FrameColor="13408665"/>
<ahaWordGroup FrameColor="clRed"/>
<ahaTemplateEditCur FrameColor="clAqua"/>
<ahaTemplateEditSync FrameColor="clFuchsia"/>
<ahaTemplateEditOther FrameColor="clMaroon"/>
<ahaSyncroEditCur FrameColor="clFuchsia"/>
<ahaSyncroEditSync FrameColor="clRed"/>
<ahaSyncroEditOther FrameColor="clBlue"/>
<ahaSyncroEditArea Background="16449510"/>
<ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
<ahaGutter Background="clBtnFace"/>
<ahaRightMargin Foreground="clSilver"/>
</SchemeDelphi>
</Globals>
<LangObjectPascal Version="6">
<SchemeDelphi>
<Assembler Foreground="clBlack"/>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Directive Foreground="clTeal"/>
<Number Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangObjectPascal>
<LangLazarus_Form_definition Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Key Style="fsBold"/>
<Number Foreground="clBlue"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangLazarus_Form_definition>
<LangXML_document Version="6">
<SchemeDelphi>
<Attribute_Name Foreground="clMaroon"/>
<Attribute_Value Foreground="clNavy" Style="fsBold"/>
<CDATA_Section Foreground="clOlive" Style="fsItalic"/>
<Comment Foreground="clGreen" Style="fsItalic"/>
<DOCTYPE_Section Foreground="clBlue" Style="fsItalic"/>
<Element_Name Foreground="clMaroon" Style="fsBold"/>
<Entity_Reference Foreground="clBlue" Style="fsBold"/>
<Namespace_Attribute_Name Foreground="clRed"/>
<Namespace_Attribute_Value Foreground="clRed" Style="fsBold"/>
<Processing_Instruction Foreground="clBlue"/>
<Text Foreground="clBlack" Style="fsBold"/>
</SchemeDelphi>
</LangXML_document>
<LangHTML_document Version="6">
<SchemeDelphi>
<Asp Background="clYellow" Foreground="clBlack"/>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Escape_ampersand Foreground="clLime" Style="fsBold"/>
<Identifier Style="fsBold"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<Unknown_word Foreground="clRed" Style="fsBold"/>
<Value Foreground="16744448"/>
</SchemeDelphi>
</LangHTML_document>
<LangC__ Version="6">
<SchemeDelphi>
<Assembler Foreground="clBlack"/>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Number Foreground="clBlue"/>
<Preprocessor Foreground="clGreen" Style="fsItalic"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangC__>
<LangPerl Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Number Foreground="clBlue"/>
<Pragma Style="fsBold"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clBlue"/>
<Variable Style="fsBold"/>
</SchemeDelphi>
</LangPerl>
<LangJava Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Documentation Foreground="clGreen" Style="fsItalic"/>
<Number Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangJava>
<LangUNIX_Shell_Script Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Number Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<String Foreground="clBlue"/>
<Variable Foreground="clPurple"/>
</SchemeDelphi>
</LangUNIX_Shell_Script>
<LangPython Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Documentation Foreground="clGreen" Style="fsItalic"/>
<Float Foreground="clBlue"/>
<Hexadecimal Foreground="clBlue"/>
<Non_reserved_keyword Foreground="clNavy" Style="fsBold"/>
<Number Foreground="clBlue"/>
<Octal Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<String Foreground="clBlue"/>
<SyntaxError Foreground="clRed"/>
<System_functions_and_variables Style="fsBold"/>
</SchemeDelphi>
</LangPython>
<LangPHP Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Number Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangPHP>
<LangSQL Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Data_type Style="fsBold"/>
<Default_packages Style="fsBold"/>
<Exception Style="fsItalic"/>
<Function Style="fsBold"/>
<Number Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<Reserved_word__PL_SQL_ Style="fsBold"/>
<SQL_Plus_command Style="fsBold"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangSQL>
<LangJavascript Version="6">
<SchemeDelphi>
<Comment Foreground="clGreen" Style="fsItalic"/>
<Number Foreground="clBlue"/>
<Reserved_word Foreground="clNavy" Style="fsBold"/>
<String Foreground="clBlue"/>
</SchemeDelphi>
</LangJavascript>
<LangDiff_File Version="6">
<SchemeDelphi>
<Diff_Added_line Foreground="clGreen"/>
<Diff_Changed_Line Foreground="clPurple"/>
<Diff_Chunk_Line_Counts Foreground="clPurple" Style="fsBold"/>
<Diff_Chunk_Marker Style="fsBold"/>
<Diff_Chunk_New_Line_Count Foreground="clGreen" Style="fsBold"/>
<Diff_Chunk_Original_Line_Count Foreground="clRed" Style="fsBold"/>
<Diff_New_File Background="clGreen" Style="fsBold"/>
<Diff_Original_File Background="clRed" Style="fsBold"/>
<Diff_Removed_Line Foreground="clRed"/>
<Unknown_word Style="fsItalic"/>
</SchemeDelphi>
</LangDiff_File>
</ColorSchemes>
</Lazarus>
</CONFIG>

197
ide/ColorOcean.xml Normal file
View File

@ -0,0 +1,197 @@
<?xml version="1.0"?>
<CONFIG>
<Lazarus>
<ColorSchemes>
<Names Count="1">
<Item1 Value="Ocean"/>
</Names>
<Globals Version="6">
<SchemeOcean>
<ahaDefault Background="clNavy" Foreground="clYellow"/>
<ahaTextBlock Background="clWhite" Foreground="clBlack"/>
<ahaExecutionPoint Background="clBlue" Foreground="clWhite"/>
<ahaEnabledBreakpoint Background="clRed" Foreground="clWhite"/>
<ahaDisabledBreakpoint Background="clLime" Foreground="clRed"/>
<ahaInvalidBreakpoint Background="clOlive" Foreground="clGreen"/>
<ahaUnknownBreakpoint Background="clRed" Foreground="clBlack"/>
<ahaErrorLine Background="5284095" Foreground="clBlack"/>
<ahaIncrementalSearch Background="3199088" Foreground="clWhite"/>
<ahaHighlightAll Background="clYellow"/>
<ahaBracketMatch Style="fsBold"/>
<ahaMouseLink Foreground="clBlue"/>
<ahaModifiedLine Foreground="clGreen" FrameColor="59900"/>
<ahaCodeFoldingTree Foreground="clSilver"/>
<ahaHighlightWord FrameColor="clSilver"/>
<ahaFoldedCode Foreground="clSilver" FrameColor="clSilver"/>
<ahaWordGroup FrameColor="clRed"/>
<ahaTemplateEditCur FrameColor="clAqua"/>
<ahaTemplateEditSync FrameColor="clFuchsia"/>
<ahaTemplateEditOther FrameColor="clMaroon"/>
<ahaSyncroEditCur FrameColor="clFuchsia"/>
<ahaSyncroEditSync FrameColor="clRed"/>
<ahaSyncroEditOther FrameColor="9744532"/>
<ahaSyncroEditArea Background="clMoneyGreen"/>
<ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
<ahaGutter Background="clBtnFace"/>
<ahaRightMargin Foreground="clSilver"/>
</SchemeOcean>
</Globals>
<LangObjectPascal Version="6">
<SchemeOcean>
<Assembler Foreground="clLime"/>
<Comment Foreground="clGray"/>
<Directive Foreground="clRed"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangObjectPascal>
<LangLazarus_Form_definition Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Key Style="fsBold"/>
<Number Foreground="clFuchsia"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangLazarus_Form_definition>
<LangXML_document Version="6">
<SchemeOcean>
<Attribute_Name Foreground="clMaroon"/>
<Attribute_Value Foreground="clNavy" Style="fsBold"/>
<CDATA_Section Foreground="clOlive" Style="fsItalic"/>
<Comment Foreground="clGray"/>
<DOCTYPE_Section Foreground="clBlue" Style="fsItalic"/>
<Element_Name Foreground="clMaroon" Style="fsBold"/>
<Entity_Reference Foreground="clBlue" Style="fsBold"/>
<Namespace_Attribute_Name Foreground="clRed"/>
<Namespace_Attribute_Value Foreground="clRed" Style="fsBold"/>
<Processing_Instruction Foreground="clBlue"/>
<Symbol Foreground="clAqua"/>
<Text Foreground="clBlack" Style="fsBold"/>
</SchemeOcean>
</LangXML_document>
<LangHTML_document Version="6">
<SchemeOcean>
<Asp Background="clYellow" Foreground="clBlack"/>
<Comment Foreground="clGray"/>
<Escape_ampersand Foreground="clLime" Style="fsBold"/>
<Identifier Style="fsBold"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Symbol Foreground="clAqua"/>
<Unknown_word Foreground="clRed" Style="fsBold"/>
<Value Foreground="16744448"/>
</SchemeOcean>
</LangHTML_document>
<LangC__ Version="6">
<SchemeOcean>
<Assembler Foreground="clLime"/>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Preprocessor Foreground="clGray"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangC__>
<LangPerl Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Pragma Style="fsBold"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
<Variable Style="fsBold"/>
</SchemeOcean>
</LangPerl>
<LangJava Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Documentation Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangJava>
<LangUNIX_Shell_Script Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
<Variable Foreground="clPurple"/>
</SchemeOcean>
</LangUNIX_Shell_Script>
<LangPython Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Documentation Foreground="clGray"/>
<Float Foreground="clBlue"/>
<Hexadecimal Foreground="clBlue"/>
<Non_reserved_keyword Foreground="clNavy" Style="fsBold"/>
<Number Foreground="clFuchsia"/>
<Octal Foreground="clBlue"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
<SyntaxError Foreground="clRed"/>
<System_functions_and_variables Style="fsBold"/>
</SchemeOcean>
</LangPython>
<LangPHP Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangPHP>
<LangSQL Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Data_type Style="fsBold"/>
<Default_packages Style="fsBold"/>
<Exception Style="fsItalic"/>
<Function Style="fsBold"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Reserved_word__PL_SQL_ Style="fsBold"/>
<SQL_Plus_command Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangSQL>
<LangJavascript Version="6">
<SchemeOcean>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeOcean>
</LangJavascript>
<LangDiff_File Version="6">
<SchemeOcean>
<Diff_Added_line Foreground="clGreen"/>
<Diff_Changed_Line Foreground="clPurple"/>
<Diff_Chunk_Line_Counts Foreground="clPurple" Style="fsBold"/>
<Diff_Chunk_Marker Style="fsBold"/>
<Diff_Chunk_New_Line_Count Foreground="clGreen" Style="fsBold"/>
<Diff_Chunk_Original_Line_Count Foreground="clRed" Style="fsBold"/>
<Diff_New_File Background="clGreen" Style="fsBold"/>
<Diff_Original_File Background="clRed" Style="fsBold"/>
<Diff_Removed_Line Foreground="clRed"/>
<Unknown_word Style="fsItalic"/>
</SchemeOcean>
</LangDiff_File>
</ColorSchemes>
</Lazarus>
</CONFIG>

196
ide/ColorPascalClassic.xml Normal file
View File

@ -0,0 +1,196 @@
<?xml version="1.0"?>
<CONFIG>
<Lazarus>
<ColorSchemes>
<Names Count="1">
<Item1 Value="Pascal_Classic"/>
</Names>
<Globals Version="6">
<SchemePascal_Classic>
<ahaDefault Background="clNavy" Foreground="clYellow"/>
<ahaTextBlock Background="clBlue" Foreground="clWhite"/>
<ahaExecutionPoint Background="clAqua" Foreground="clBlack"/>
<ahaEnabledBreakpoint Background="clRed" Foreground="clWhite"/>
<ahaDisabledBreakpoint Background="clLime" Foreground="clRed"/>
<ahaInvalidBreakpoint Background="clOlive" Foreground="clLime"/>
<ahaErrorLine Background="clMaroon" Foreground="clWhite"/>
<ahaIncrementalSearch Background="3199088" Foreground="clWhite"/>
<ahaHighlightAll Background="clYellow"/>
<ahaBracketMatch Style="fsBold"/>
<ahaMouseLink Foreground="clBlue"/>
<ahaModifiedLine Foreground="clGreen" FrameColor="59900"/>
<ahaCodeFoldingTree Foreground="clSilver"/>
<ahaHighlightWord FrameColor="clSilver"/>
<ahaFoldedCode Foreground="clSilver" FrameColor="clSilver"/>
<ahaWordGroup FrameColor="clRed"/>
<ahaTemplateEditCur FrameColor="clAqua"/>
<ahaTemplateEditSync FrameColor="clFuchsia"/>
<ahaTemplateEditOther FrameColor="clMaroon"/>
<ahaSyncroEditCur FrameColor="clFuchsia"/>
<ahaSyncroEditSync FrameColor="clRed"/>
<ahaSyncroEditOther FrameColor="9744532"/>
<ahaSyncroEditArea Background="clMoneyGreen"/>
<ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
<ahaGutter Background="clBtnFace"/>
<ahaRightMargin Foreground="clSilver"/>
</SchemePascal_Classic>
</Globals>
<LangObjectPascal Version="6">
<SchemePascal_Classic>
<Assembler Foreground="clLime"/>
<Comment Foreground="clSilver"/>
<Directive Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Reserved_word Foreground="clWhite"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangObjectPascal>
<LangLazarus_Form_definition Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Key Style="fsBold"/>
<Number Foreground="clYellow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangLazarus_Form_definition>
<LangXML_document Version="6">
<SchemePascal_Classic>
<Attribute_Name Foreground="clMaroon"/>
<Attribute_Value Foreground="clNavy" Style="fsBold"/>
<CDATA_Section Foreground="clOlive" Style="fsItalic"/>
<Comment Foreground="clSilver"/>
<DOCTYPE_Section Foreground="clBlue" Style="fsItalic"/>
<Element_Name Foreground="clMaroon" Style="fsBold"/>
<Entity_Reference Foreground="clBlue" Style="fsBold"/>
<Namespace_Attribute_Name Foreground="clRed"/>
<Namespace_Attribute_Value Foreground="clRed" Style="fsBold"/>
<Processing_Instruction Foreground="clBlue"/>
<Symbol Foreground="clYellow"/>
<Text Foreground="clBlack" Style="fsBold"/>
</SchemePascal_Classic>
</LangXML_document>
<LangHTML_document Version="6">
<SchemePascal_Classic>
<Asp Background="clYellow" Foreground="clBlack"/>
<Comment Foreground="clSilver"/>
<Escape_ampersand Foreground="clLime" Style="fsBold"/>
<Identifier Style="fsBold"/>
<Reserved_word Foreground="clWhite"/>
<Symbol Foreground="clYellow"/>
<Unknown_word Foreground="clRed" Style="fsBold"/>
<Value Foreground="16744448"/>
</SchemePascal_Classic>
</LangHTML_document>
<LangC__ Version="6">
<SchemePascal_Classic>
<Assembler Foreground="clLime"/>
<Comment Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Preprocessor Foreground="clSilver"/>
<Reserved_word Foreground="clWhite"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangC__>
<LangPerl Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Pragma Style="fsBold"/>
<Reserved_word Foreground="clWhite"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
<Variable Style="fsBold"/>
</SchemePascal_Classic>
</LangPerl>
<LangJava Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Documentation Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Reserved_word Foreground="clWhite"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangJava>
<LangUNIX_Shell_Script Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Reserved_word Foreground="clWhite"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
<Variable Foreground="clPurple"/>
</SchemePascal_Classic>
</LangUNIX_Shell_Script>
<LangPython Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Documentation Foreground="clSilver"/>
<Float Foreground="clBlue"/>
<Hexadecimal Foreground="clBlue"/>
<Non_reserved_keyword Foreground="clNavy" Style="fsBold"/>
<Number Foreground="clYellow"/>
<Octal Foreground="clBlue"/>
<Reserved_word Foreground="clWhite"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
<SyntaxError Foreground="clRed"/>
<System_functions_and_variables Style="fsBold"/>
</SchemePascal_Classic>
</LangPython>
<LangPHP Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Reserved_word Foreground="clWhite"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangPHP>
<LangSQL Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Data_type Style="fsBold"/>
<Default_packages Style="fsBold"/>
<Exception Style="fsItalic"/>
<Function Style="fsBold"/>
<Number Foreground="clYellow"/>
<Reserved_word Foreground="clWhite"/>
<Reserved_word__PL_SQL_ Style="fsBold"/>
<SQL_Plus_command Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangSQL>
<LangJavascript Version="6">
<SchemePascal_Classic>
<Comment Foreground="clSilver"/>
<Number Foreground="clYellow"/>
<Reserved_word Foreground="clWhite"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clYellow"/>
</SchemePascal_Classic>
</LangJavascript>
<LangDiff_File Version="6">
<SchemePascal_Classic>
<Diff_Added_line Foreground="clGreen"/>
<Diff_Changed_Line Foreground="clPurple"/>
<Diff_Chunk_Line_Counts Foreground="clPurple" Style="fsBold"/>
<Diff_Chunk_Marker Style="fsBold"/>
<Diff_Chunk_New_Line_Count Foreground="clGreen" Style="fsBold"/>
<Diff_Chunk_Original_Line_Count Foreground="clRed" Style="fsBold"/>
<Diff_New_File Background="clGreen" Style="fsBold"/>
<Diff_Original_File Background="clRed" Style="fsBold"/>
<Diff_Removed_Line Foreground="clRed"/>
<Unknown_word Style="fsItalic"/>
</SchemePascal_Classic>
</LangDiff_File>
</ColorSchemes>
</Lazarus>
</CONFIG>

197
ide/ColorTwilight.xml Normal file
View File

@ -0,0 +1,197 @@
<?xml version="1.0"?>
<CONFIG>
<Lazarus>
<ColorSchemes>
<Names Count="1">
<Item1 Value="Twilight"/>
</Names>
<Globals Version="6">
<SchemeTwilight>
<ahaDefault Background="clBlack" Foreground="clWhite"/>
<ahaTextBlock Background="clWhite" Foreground="clBlack"/>
<ahaExecutionPoint Background="clBlue" Foreground="clWhite"/>
<ahaEnabledBreakpoint Background="clRed" Foreground="clWhite"/>
<ahaDisabledBreakpoint Background="clLime" Foreground="clRed"/>
<ahaInvalidBreakpoint Background="clOlive" Foreground="clGreen"/>
<ahaUnknownBreakpoint Background="clRed" Foreground="clBlack"/>
<ahaErrorLine Background="5284095" Foreground="clBlack"/>
<ahaIncrementalSearch Background="3199088" Foreground="clWhite"/>
<ahaHighlightAll Background="clYellow"/>
<ahaBracketMatch Style="fsBold"/>
<ahaMouseLink Foreground="clBlue"/>
<ahaModifiedLine Foreground="clGreen" FrameColor="59900"/>
<ahaCodeFoldingTree Foreground="clSilver"/>
<ahaHighlightWord Background="3158064" FrameColor="clSilver"/>
<ahaFoldedCode Foreground="clSilver" FrameColor="clSilver"/>
<ahaWordGroup FrameColor="clRed"/>
<ahaTemplateEditCur FrameColor="clAqua"/>
<ahaTemplateEditSync FrameColor="clFuchsia"/>
<ahaTemplateEditOther FrameColor="clMaroon"/>
<ahaSyncroEditCur FrameColor="clFuchsia"/>
<ahaSyncroEditSync FrameColor="clRed"/>
<ahaSyncroEditOther FrameColor="9744532"/>
<ahaSyncroEditArea Background="clMoneyGreen"/>
<ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
<ahaGutter Background="clBtnFace"/>
<ahaRightMargin Foreground="clSilver"/>
</SchemeTwilight>
</Globals>
<LangObjectPascal Version="6">
<SchemeTwilight>
<Assembler Foreground="clLime"/>
<Comment Foreground="clGray"/>
<Directive Foreground="clRed"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangObjectPascal>
<LangLazarus_Form_definition Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Key Style="fsBold"/>
<Number Foreground="clFuchsia"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangLazarus_Form_definition>
<LangXML_document Version="6">
<SchemeTwilight>
<Attribute_Name Foreground="clMaroon"/>
<Attribute_Value Foreground="clNavy" Style="fsBold"/>
<CDATA_Section Foreground="clOlive" Style="fsItalic"/>
<Comment Foreground="clGray"/>
<DOCTYPE_Section Foreground="clBlue" Style="fsItalic"/>
<Element_Name Foreground="clMaroon" Style="fsBold"/>
<Entity_Reference Foreground="clBlue" Style="fsBold"/>
<Namespace_Attribute_Name Foreground="clRed"/>
<Namespace_Attribute_Value Foreground="clRed" Style="fsBold"/>
<Processing_Instruction Foreground="clBlue"/>
<Symbol Foreground="clAqua"/>
<Text Foreground="clBlack" Style="fsBold"/>
</SchemeTwilight>
</LangXML_document>
<LangHTML_document Version="6">
<SchemeTwilight>
<Asp Background="clYellow" Foreground="clBlack"/>
<Comment Foreground="clGray"/>
<Escape_ampersand Foreground="clLime" Style="fsBold"/>
<Identifier Style="fsBold"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Symbol Foreground="clAqua"/>
<Unknown_word Foreground="clRed" Style="fsBold"/>
<Value Foreground="16744448"/>
</SchemeTwilight>
</LangHTML_document>
<LangC__ Version="6">
<SchemeTwilight>
<Assembler Foreground="clLime"/>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Preprocessor Foreground="clGray"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangC__>
<LangPerl Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Pragma Style="fsBold"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
<Variable Style="fsBold"/>
</SchemeTwilight>
</LangPerl>
<LangJava Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Documentation Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Space Foreground="clWindow"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangJava>
<LangUNIX_Shell_Script Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
<Variable Foreground="clPurple"/>
</SchemeTwilight>
</LangUNIX_Shell_Script>
<LangPython Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Documentation Foreground="clGray"/>
<Float Foreground="clBlue"/>
<Hexadecimal Foreground="clBlue"/>
<Non_reserved_keyword Foreground="clNavy" Style="fsBold"/>
<Number Foreground="clFuchsia"/>
<Octal Foreground="clBlue"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
<SyntaxError Foreground="clRed"/>
<System_functions_and_variables Style="fsBold"/>
</SchemeTwilight>
</LangPython>
<LangPHP Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangPHP>
<LangSQL Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Data_type Style="fsBold"/>
<Default_packages Style="fsBold"/>
<Exception Style="fsItalic"/>
<Function Style="fsBold"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<Reserved_word__PL_SQL_ Style="fsBold"/>
<SQL_Plus_command Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangSQL>
<LangJavascript Version="6">
<SchemeTwilight>
<Comment Foreground="clGray"/>
<Number Foreground="clFuchsia"/>
<Reserved_word Foreground="clAqua" Style="fsBold"/>
<String Foreground="clYellow"/>
<Symbol Foreground="clAqua"/>
</SchemeTwilight>
</LangJavascript>
<LangDiff_File Version="6">
<SchemeTwilight>
<Diff_Added_line Foreground="clGreen"/>
<Diff_Changed_Line Foreground="clPurple"/>
<Diff_Chunk_Line_Counts Foreground="clPurple" Style="fsBold"/>
<Diff_Chunk_Marker Style="fsBold"/>
<Diff_Chunk_New_Line_Count Foreground="clGreen" Style="fsBold"/>
<Diff_Chunk_Original_Line_Count Foreground="clRed" Style="fsBold"/>
<Diff_New_File Background="clGreen" Style="fsBold"/>
<Diff_Original_File Background="clRed" Style="fsBold"/>
<Diff_Removed_Line Foreground="clRed"/>
<Unknown_word Style="fsItalic"/>
</SchemeTwilight>
</LangDiff_File>
</ColorSchemes>
</Lazarus>
</CONFIG>

View File

@ -955,12 +955,12 @@ begin
// init synedit
ColorScheme:=EditorOpts.ReadColorScheme(ASynPasSyn.GetLanguageName);
EditorOpts.AddSpecialHilightAttribsToHighlighter(ASynPasSyn);
EditorOpts.ReadHighlighterSettings(ASynPasSyn,ColorScheme);
if EditorOpts.UseSyntaxHighlight then
TemplateSynEdit.Highlighter:=ASynPasSyn
else
TemplateSynEdit.Highlighter:=nil;
EditorOpts.SetMarkupColors(TemplateSynEdit);
EditorOpts.GetSynEditSettings(TemplateSynEdit);
EditorOpts.KeyMap.AssignTo(TemplateSynEdit.KeyStrokes,
TSourceEditorWindowInterface);

File diff suppressed because it is too large Load Diff

5
ide/editoroptions.rc Normal file
View File

@ -0,0 +1,5 @@
ColorSchemeDefault RCDATA "ColorDefault.xml"
ColorSchemeDelphi RCDATA "ColorDelphi.xml"
ColorSchemeOcean RCDATA "ColorOcean.xml"
ColorSchemePascalClassic RCDATA "ColorPascalClassic.xml"
ColorSchemeTwilight RCDATA "ColorTwilight.xml"

View File

@ -119,7 +119,6 @@ begin
if FHighlighter = nil then
begin
FHighlighter := TPreviewPasSyn.Create(Self);
Options.AddSpecialHilightAttribsToHighlighter(FHighlighter);
Options.ReadHighlighterSettings(FHighlighter, '');
end;
Result := FHighlighter;

View File

@ -122,7 +122,6 @@ begin
if FHighlighter = nil then
begin
FHighlighter := TPreviewPasSyn.Create(Self);
Options.AddSpecialHilightAttribsToHighlighter(FHighlighter);
Options.ReadHighlighterSettings(FHighlighter, '');
end;
Result := FHighlighter;

File diff suppressed because it is too large Load Diff

View File

@ -1387,6 +1387,7 @@ resourcestring
dlgCheckConsistency = 'Check consistency';
lisEdOptsChooseScheme = 'Choose Scheme';
dlgLang = 'Language';
dlgEditSchemDefaults = 'Scheme globals';
lis0No1DrawDividerLinesOnlyForTopLevel2DrawLinesForFi = '0 = no, 1 = draw '
+'divider lines only for top level, 2 = draw lines for first two '
+'levels, ...';
@ -1394,6 +1395,9 @@ resourcestring
dlgFileExts = 'File extensions';
dlgSetElementDefault = 'Set element to default';
dlgSetAllElementDefault = 'Set all elements to default';
dlgColorExportButton = 'Export';
dlgUseSchemeDefaults = 'Use global scheme settings';
dlgWarnEditSchemeDefaults = 'Editing global for all languages';
dlgColor = 'Color';
dlgForecolor = 'Foreground';
dlgFrameColor = 'Frame color';
@ -1512,6 +1516,7 @@ resourcestring
dlgMouseFoldModifierCtrl = 'Ctrl';
dlgMouseFoldModifierAlt = 'Alt';
dlgAddHiAttrDefault = 'Default Text';
dlgAddHiAttrTextBlock = 'Text block';
dlgAddHiAttrExecutionPoint = 'Execution point';
dlgAddHiAttrEnabledBreakpoint = 'Enabled breakpoint';
@ -1539,6 +1544,7 @@ resourcestring
dlgAddHiAttrSyncroEditArea = 'Selected Area';
dlgAddHiAttrGutterSeparator = 'Gutter Separator';
dlgAddHiAttrGroupDefault = 'Global';
dlgAddHiAttrGroupText = 'Text';
dlgAddHiAttrGroupLine = 'Line';
dlgAddHiAttrGroupGutter = 'Gutter';
@ -1646,6 +1652,8 @@ resourcestring
dlgAddSemicolon = 'Add semicolon';
dlgAddAssignmentOperator = 'Add assignment operator :=';
dlgUserSchemeError = 'Failed to load user-scheme file %s';
// source editor
locwndSrcEditor = 'Source Editor';

View File

@ -1440,7 +1440,6 @@ var
Prefix: String;
I: Integer;
NewStr: String;
fst, fstm : TFontStyles;
Begin
{$IFDEF VerboseIDECompletionBox}
debugln(['TSourceEditCompletion.ccExecute START']);
@ -1448,8 +1447,8 @@ Begin
TheForm.Font := Editor.Font;
FActiveEditDefaultFGColor := Editor.Font.Color;
FActiveEditDefaultBGColor := Editor.Color;
EditorOpts.GetLineColors(Editor.Highlighter, ahaTextBlock, {TODO: MFR use AEditor.SelectedColor which includes styles / or have a copy}
FActiveEditSelectedFGColor, FActiveEditSelectedBGColor, fst ,fstm);
FActiveEditSelectedFGColor := TSynEdit(Editor).SelectedColor.Foreground;
FActiveEditSelectedBGColor := TSynEdit(Editor).SelectedColor.Background;
if Editor.Highlighter<>nil
then begin
@ -7404,7 +7403,7 @@ end;
procedure TSourceNotebook.UpdateActiveEditColors(AEditor: TSynEdit);
begin
if AEditor=nil then exit;
EditorOpts.SetMarkupColors(AEditor.Highlighter, AEditor);
EditorOpts.SetMarkupColors(AEditor);
AEditor.UseIncrementalColor:= snIncrementalFind in States;
end;