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

IDE: EditorOptions, user colors fixed frame init. Issue #0025853

Browse Source 
git-svn-id: trunk@44409 -
This commit is contained in:
martin 2014-03-11 23:31:21 +00:00
parent e3b1d7060b
commit 8d8f500e71
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/frames/editor_markup_userdefined.pas
View File

@ -112,8 +112,6 @@ type
procedure UpdateListDropDownFull; procedure UpdateListDropDownFull;
procedure UpdateListDropDownCaption; procedure UpdateListDropDownCaption;
procedure UpdateListDisplay(KeepDuplicates: Boolean = False); procedure UpdateListDisplay(KeepDuplicates: Boolean = False);
protected
procedure SetVisible(Value: Boolean); override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -634,24 +632,6 @@ begin
WordListSelection(nil, 0, 0); WordListSelection(nil, 0, 0);
end; end;
procedure TEditorMarkupUserDefinedFrame.SetVisible(Value: Boolean);
begin
if FGlobalColors <> nil then begin
// Finish ReadSettings - Now TEditorKeymappingOptionsFrame should be ready
FUserWordsList.Assign(FGlobalColors);
FSelectedListIdx := 0;
UpdateListDropDownFull;
UpdateListDisplay;
tbDeleteList.Enabled := FUserWordsList.Count > 0;
FGlobalColors := nil;
UpdateKeys;
end
else
UpdateKeys;
inherited SetVisible(Value);
end;
constructor TEditorMarkupUserDefinedFrame.Create(AOwner: TComponent); constructor TEditorMarkupUserDefinedFrame.Create(AOwner: TComponent);
begin begin
inherited Create(AOwner); inherited Create(AOwner);
@ -705,6 +685,16 @@ procedure TEditorMarkupUserDefinedFrame.ReadSettings(AOptions: TAbstractIDEOptio
begin begin
FGlobalColors := TEditorOptions(AOptions).UserDefinedColors; FGlobalColors := TEditorOptions(AOptions).UserDefinedColors;
FSelectedListIdx := 0; FSelectedListIdx := 0;
FKeyOptFrame.ReadSettings(AOptions);
FUserWordsList.Assign(FGlobalColors);
FSelectedListIdx := 0;
UpdateListDropDownFull;
UpdateListDisplay;
tbDeleteList.Enabled := FUserWordsList.Count > 0;
FGlobalColors := nil;
UpdateKeys;
end; end;
procedure TEditorMarkupUserDefinedFrame.WriteSettings(AOptions: TAbstractIDEOptions); procedure TEditorMarkupUserDefinedFrame.WriteSettings(AOptions: TAbstractIDEOptions);