paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-05 04:27:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: fix translations for color opts, broken in 900e58ed4f by too early init.

Browse Source
This commit is contained in:
Martin 2025-03-20 21:12:00 +01:00
parent 41ef935d69
commit 83ef9dce86
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/ideintf/editorsyntaxhighlighterdef.pas
View File

@ -6,7 +6,7 @@ unit EditorSyntaxHighlighterDef;
interface
uses
Classes, SysUtils;
Classes, SysUtils, LazMethodList;
type
TLazSyntaxHighlighter =
@ -121,6 +121,10 @@ var
IdeSyntaxHighlighters: TIdeSyntaxHighlighterList;
IdeColorSchemeList: IColorSchemeList;
procedure RegisterOnIdeColorSchemeListCreated(AnHandler: TNotifyEvent);
procedure _IDE_CallOnIdeColorSchemeListCreated;
implementation
function GetSyntaxHighlighterCaption(h: TLazSyntaxHighlighter): string;
@ -133,5 +137,25 @@ begin
Result := IdeSyntaxHighlighters.GetLazSyntaxHighlighterType(IdeSyntaxHighlighters.GetIdForName(s)){%H-};
end;
var
OnIdeColorSchemeListCreated: TMethodList;
procedure RegisterOnIdeColorSchemeListCreated(AnHandler: TNotifyEvent);
begin
if IdeColorSchemeList <> nil then begin
AnHandler(nil);
exit;
end;
if OnIdeColorSchemeListCreated = nil then
OnIdeColorSchemeListCreated := TMethodList.Create;
OnIdeColorSchemeListCreated.Add(TMethod(AnHandler));
end;
procedure _IDE_CallOnIdeColorSchemeListCreated;
begin
OnIdeColorSchemeListCreated.CallNotifyEvents(nil);
FreeAndNil(OnIdeColorSchemeListCreated);
end;
end.

8
components/todolist/todosynmarkup.pas
View File

@ -60,6 +60,7 @@ type
TTodoEditorHandler = class
procedure DoEditorCreated(Sender: TObject);
procedure DoColorsChanged(Sender: TObject);
procedure DoRegisterAttribs(Sender: TObject);
end;
var
@ -131,6 +132,11 @@ begin
attr.ApplyTo(CommentAttribNote);
end;
procedure TTodoEditorHandler.DoRegisterAttribs(Sender: TObject);
begin
RegisterAttribs;
end;
{ TSynEditTodoMarkup }
procedure TSynEditTodoMarkup.BeginMarkup;
@ -536,7 +542,7 @@ begin
end;
initialization
RegisterAttribs;
RegisterOnIdeColorSchemeListCreated(@TTodoEditorHandler(nil).DoRegisterAttribs);
finalization
FreeAttribs;
end.

3
ide/editoroptions.pp
View File

@ -2947,6 +2947,8 @@ begin
FileList.Free;
end;
end;
IdeColorSchemeList := Singleton;
_IDE_CallOnIdeColorSchemeListCreated;
Result := Singleton;
end;
@ -8436,7 +8438,6 @@ end;
initialization
RegisterIDEOptionsGroup(GroupEditor, TEditorOptions);
IdeSyntaxHighlighters := HighlighterList;
IdeColorSchemeList := ColorSchemeFactory;
finalization
IdeColorSchemeList := nil;