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

Create component palette in MainIDE instead of PkgManager.

Browse Source 
git-svn-id: trunk@48314 -
This commit is contained in:
juha 2015-03-12 23:02:02 +00:00
parent 5e4005ece3
commit 152d9d6397
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ide/main.pp
View File

@ -1407,6 +1407,8 @@ constructor TMainIDE.Create(TheOwner: TComponent);
var
Layout: TSimpleWindowLayout;
FormCreator: TIDEWindowCreator;
PkgMngr: TPkgManager;
CompPalette: TComponentPalette;
AMenuHeight: Integer;
begin
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Create START');{$ENDIF}
@ -1505,7 +1507,8 @@ begin
DebugBoss.ConnectMainBarEvents;
DebuggerDlg.OnProcessCommand := @OnProcessIDECommand;
PkgBoss:=TPkgManager.Create(nil);
PkgMngr:=TPkgManager.Create(nil);
PkgBoss:=PkgMngr;
PkgBoss.ConnectMainBarEvents;
LPKInfoCache:=TLPKInfoCache.Create;
HelpBoss:=TIDEHelpManager.Create(nil);
@ -1522,8 +1525,13 @@ begin
LoadMenuShortCuts;
{$IFDEF IDE_MEM_CHECK}CheckHeapWrtMemCnt('TMainIDE.Create IDE COMPONENTS');{$ENDIF}
// componentpalette
CompPalette:=TComponentPalette.Create;
IDEComponentPalette:=CompPalette;
CompPalette.OnOpenPackage:=@PkgMngr.IDEComponentPaletteOpenPackage;
CompPalette.OnOpenUnit:=@PkgMngr.IDEComponentPaletteOpenUnit;
CompPalette.PageControl:=MainIDEBar.ComponentPageControl;
// load installed packages
TComponentPalette(IDEComponentPalette).PageControl:=MainIDEBar.ComponentPageControl;
PkgBoss.LoadInstalledPackages;
EditorMacroListViewer.LoadGlobalInfo; // Must be after packages are loaded/registered.
@ -1616,7 +1624,10 @@ begin
FreeThenNil(IDEQuickFixes);
FreeThenNil(GlobalDesignHook);
FreeThenNil(LPKInfoCache);
if IDEComponentPalette<>nil then
TComponentPalette(IDEComponentPalette).PageControl:=nil;
FreeThenNil(PkgBoss);
FreeThenNil(IDEComponentPalette);
FreeThenNil(HelpBoss);
FreeThenNil(DebugBoss);
FreeThenNil(TheCompiler);

13
packager/pkgmanager.pas
View File

@ -63,7 +63,7 @@ uses
PackageDefs, PackageLinks, PackageSystem, OpenInstalledPkgDlg,
PkgGraphExplorer, BrokenDependenciesDlg, CompilerOptions,
IDETranslations, TransferMacros, BuildLazDialog, NewDialog, FindInFilesDlg,
IDEDialogs, UnitResources, ProjectInspector, ComponentPalette, SourceEditor,
IDEDialogs, UnitResources, ProjectInspector, SourceEditor,
AddFileToAPackageDlg, LazarusPackageIntf, PublishProjectDlg, PkgLinksDlg,
InterPkgConflictFiles, InstallPkgSetDlg, ConfirmPkgListDlg, NewPkgComponentDlg,
// bosses
@ -2892,20 +2892,12 @@ begin
end;
constructor TPkgManager.Create(TheOwner: TComponent);
var
CompPalette: TComponentPalette;
begin
inherited Create(TheOwner);
OnGetDependencyOwnerDescription:=@GetDependencyOwnerDescription;
OnGetDependencyOwnerDirectory:=@GetDependencyOwnerDirectory;
OnPackageFileLoaded:=@PackageFileLoaded;
// componentpalette
IDEComponentPalette:=TComponentPalette.Create;
CompPalette:=TComponentPalette(IDEComponentPalette);
CompPalette.OnOpenPackage:=@IDEComponentPaletteOpenPackage;
CompPalette.OnOpenUnit:=@IDEComponentPaletteOpenUnit;
// package links
PkgLinks:=TPackageLinks.Create;
PkgLinks.UpdateAll;
@ -2972,15 +2964,12 @@ end;
destructor TPkgManager.Destroy;
begin
if IDEComponentPalette<>nil then
TComponentPalette(IDEComponentPalette).PageControl:=nil;
FreeThenNil(LazPackageDescriptors);
PackageGraph.FreeAutoInstallDependencies;
FreeThenNil(PackageGraphExplorer);
FreeThenNil(PackageEditors);
FreeThenNil(PackageGraph);
FreeThenNil(PkgLinks);
FreeThenNil(IDEComponentPalette);
FreeThenNil(PackageDependencies);
inherited Destroy;
end;