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

EditorOptions, color-scheme: ensure correct default

Browse Source 
git-svn-id: trunk@25718 -
This commit is contained in:
martin 2010-05-27 22:24:42 +00:00
parent ac3c0d20ca
commit c246a1ed1f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ide/editoroptions.pp
View File

@ -1193,6 +1193,9 @@ const
lshDiff
);
var
DefaultColorSchemeName: String;
{ TSynEditMouseActionKeyCmdHelper }
function TSynEditMouseActionKeyCmdHelper.GetOptionKeyCmd: TSynEditorCommand;
@ -1362,6 +1365,7 @@ begin
AddFromResource('ColorSchemePascalClassic', 'Pascal Classic');
AddFromResource('ColorSchemeOcean', 'Ocean');
AddFromResource('ColorSchemeDelphi', 'Delphi');
DefaultColorSchemeName := 'Default';
if DirectoryExistsUTF8(UserSchemeDirectory(False)) then begin
FileList := FindAllFiles(UserSchemeDirectory(False), '*.xml', False);
@ -3532,8 +3536,12 @@ begin
TPreviewPasSyn.GetLanguageName) + '/ColorScheme/Value', '')
else
Result := XMLConfig.GetValue('EditorOptions/Color/ColorScheme', '');
if Result = '' then
Result := ColorSchemeFactory.ColorSchemeGroupAtPos[0].Name;
if (Result = '') then begin
if DefaultColorSchemeName <> '' then
Result := DefaultColorSchemeName
else
Result := ColorSchemeFactory.ColorSchemeGroupAtPos[0].Name;
end;
end;
procedure TEditorOptions.WriteColorScheme(const LanguageName, SynColorScheme: String);