IDE: Update EditorToolbars always after changing environment options.

git-svn-id: trunk@49546 -
This commit is contained in:
juha 2015-07-14 11:10:06 +00:00
parent 3fd22d1635
commit ee4ff0e746
2 changed files with 4 additions and 3 deletions

View File

@ -29,7 +29,8 @@ interface
uses uses
Classes, SysUtils, ExtCtrls, Buttons, Controls, StdCtrls, DividerBevel, Classes, SysUtils, ExtCtrls, Buttons, Controls, StdCtrls, DividerBevel,
LazarusIDEStrConsts, IDEOptionsIntf, EnvironmentOpts, EditorToolbarStatic, ToolbarConfig, LCLProc; LazarusIDEStrConsts, LCLProc, IDEOptionsIntf, EnvironmentOpts,
EditorToolbarStatic, ToolbarConfig;
type type
@ -127,7 +128,6 @@ var
begin begin
Opts := (AOptions as TEnvironmentOptions).Desktop.EditorToolBarOptions; Opts := (AOptions as TEnvironmentOptions).Desktop.EditorToolBarOptions;
Opts.Assign(FLocalOptions); Opts.Assign(FLocalOptions);
uAllEditorToolbars.ReloadAll;
end; end;
class function TEditorToolbarOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass; class function TEditorToolbarOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;

View File

@ -156,7 +156,7 @@ uses
UseUnitDlg, FindOverloadsDlg, EditorFileManager, UseUnitDlg, FindOverloadsDlg, EditorFileManager,
CleanDirDlg, CodeContextForm, AboutFrm, CompatibilityRestrictions, CleanDirDlg, CodeContextForm, AboutFrm, CompatibilityRestrictions,
RestrictionBrowser, ProjectWizardDlg, IDECmdLine, IDEGuiCmdLine, CodeExplOpts, RestrictionBrowser, ProjectWizardDlg, IDECmdLine, IDEGuiCmdLine, CodeExplOpts,
EditorMacroListViewer, SourceFileManager, EditorMacroListViewer, SourceFileManager, EditorToolbarStatic,
// main ide // main ide
MainBar, MainIntf, MainBase; MainBar, MainIntf, MainBase;
@ -4669,6 +4669,7 @@ begin
Application.TaskBarBehavior := tbSingleButton Application.TaskBarBehavior := tbSingleButton
else else
Application.TaskBarBehavior := tbDefault; Application.TaskBarBehavior := tbDefault;
uAllEditorToolbars.ReloadAll;
// reload lazarus packages // reload lazarus packages
if LazarusSrcDirChanged then if LazarusSrcDirChanged then