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

IDE: Fix compilation of componentpalette with VerboseComponentPalette flag. Cleanup.

Browse Source 
git-svn-id: trunk@48306 -
This commit is contained in:
juha 2015-03-12 23:01:49 +00:00
parent 443c7df5a4
commit 246d23e207
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/componentpalette.pas
View File

@ -141,6 +141,8 @@ type
fVisiblePageIndex: integer; fVisiblePageIndex: integer;
// User ordered + original pages and components // User ordered + original pages and components
fUserOrder: TCompPaletteUserOrder; fUserOrder: TCompPaletteUserOrder;
procedure ClearButtons;
function FindPkgCompByButton(Button: TComponent): TPkgComponent;
procedure ReAlignButtons(aSheet: TCustomPage); procedure ReAlignButtons(aSheet: TCustomPage);
procedure UpdateNoteBookButtons(ForceUpdateAll: Boolean); procedure UpdateNoteBookButtons(ForceUpdateAll: Boolean);
//procedure AssociatePageComps(aPageInd: Integer; aCompNames: TStringList); //procedure AssociatePageComps(aPageInd: Integer; aCompNames: TStringList);
@ -173,8 +175,6 @@ type
public public
constructor Create; constructor Create;
destructor Destroy; override; destructor Destroy; override;
procedure Clear;
procedure ClearButtons;
procedure DoAfterComponentAdded; override; procedure DoAfterComponentAdded; override;
procedure OnGetNonVisualCompIcon(Sender: TObject; procedure OnGetNonVisualCompIcon(Sender: TObject;
AComponent: TComponent; var Icon: TCustomBitmap); AComponent: TComponent; var Icon: TCustomBitmap);
@ -660,7 +660,7 @@ procedure TComponentPalette.OpenPackageClicked(Sender: TObject);
var var
PkgComponent: TPkgComponent; PkgComponent: TPkgComponent;
begin begin
PkgComponent:=TPkgComponent(FindButton(PopupMenu.PopupComponent)); PkgComponent:=FindPkgCompByButton(PopupMenu.PopupComponent);
if (PkgComponent=nil) or (PkgComponent.PkgFile=nil) if (PkgComponent=nil) or (PkgComponent.PkgFile=nil)
or (PkgComponent.PkgFile.LazPackage=nil) then exit; or (PkgComponent.PkgFile.LazPackage=nil) then exit;
if Assigned(OnOpenPackage) then if Assigned(OnOpenPackage) then
@ -671,7 +671,7 @@ procedure TComponentPalette.OpenUnitClicked(Sender: TObject);
var var
PkgComponent: TPkgComponent; PkgComponent: TPkgComponent;
begin begin
PkgComponent:=TPkgComponent(FindButton(PopupMenu.PopupComponent)); PkgComponent:=FindPkgCompByButton(PopupMenu.PopupComponent);
if (PkgComponent=nil) or (PkgComponent.PkgFile=nil) if (PkgComponent=nil) or (PkgComponent.PkgFile=nil)
or (PkgComponent.PkgFile.LazPackage=nil) then exit; or (PkgComponent.PkgFile.LazPackage=nil) then exit;
if Assigned(OnOpenUnit) then if Assigned(OnOpenUnit) then
@ -695,7 +695,7 @@ var
UnitFilename: String; UnitFilename: String;
ShownFilename: String; ShownFilename: String;
begin begin
PkgComponent:=TPkgComponent(FindButton(PopupMenu.PopupComponent)); PkgComponent:=FindPkgCompByButton(PopupMenu.PopupComponent);
APackage:=nil; APackage:=nil;
if (PkgComponent<>nil) and (PkgComponent.PkgFile<>nil) then if (PkgComponent<>nil) and (PkgComponent.PkgFile<>nil) then
APackage:=PkgComponent.PkgFile.LazPackage; APackage:=PkgComponent.PkgFile.LazPackage;
@ -832,6 +832,8 @@ begin
end; end;
procedure TComponentPalette.SetSelected(const AValue: TRegisteredComponent); procedure TComponentPalette.SetSelected(const AValue: TRegisteredComponent);
var
Sheet: TTabSheet;
begin begin
if FSelected=AValue then exit; if FSelected=AValue then exit;
FSelected:=AValue; FSelected:=AValue;
@ -845,12 +847,12 @@ begin
UnselectAllButtons; UnselectAllButtons;
if FSelected=nil then exit; if FSelected=nil then exit;
Assert(Assigned(FSelected.RealPage), 'TComponentPalette.SetSelected: FSelected.RealPage = Nil.'); Assert(Assigned(FSelected.RealPage), 'TComponentPalette.SetSelected: FSelected.RealPage = Nil.');
Sheet:=(FSelected.RealPage as TComponentPage).PageComponent as TTabSheet;
{$IFDEF VerboseComponentPalette} {$IFDEF VerboseComponentPalette}
DebugLn(['TComponentPalette.SetSelected: Setting FPageControl.ActivePage=', DebugLn(['TComponentPalette.SetSelected: Setting FPageControl.ActivePage=',Sheet,', Index ',Sheet.PageIndex]);
FSelected.RealPage.PageComponent, ', Index ', FSelected.RealPage.PageComponent.PageIndex]);
{$ENDIF} {$ENDIF}
// Switch to the new page // Switch to the new page
FPageControl.ActivePage:=TTabSheet((FSelected.RealPage as TComponentPage).PageComponent); FPageControl.ActivePage:=Sheet;
// Build the GUI layout for this page if not done yet. // Build the GUI layout for this page if not done yet.
if FSelected.Button=nil then if FSelected.Button=nil then
ReAlignButtons(FPageControl.ActivePage); ReAlignButtons(FPageControl.ActivePage);
@ -1065,13 +1067,6 @@ begin
inherited Destroy; inherited Destroy;
end; end;
procedure TComponentPalette.Clear;
begin
ClearButtons;
fUserOrder.Clear;
inherited Clear;
end;
procedure TComponentPalette.ClearButtons; procedure TComponentPalette.ClearButtons;
begin begin
if FPageControl<>nil then if FPageControl<>nil then
@ -1346,6 +1341,11 @@ begin
Result:=nil; Result:=nil;
end; end;
function TComponentPalette.FindPkgCompByButton(Button: TComponent): TPkgComponent;
begin
Result := FindButton(Button) as TPkgComponent;
end;
{$IFDEF CustomIDEComps} {$IFDEF CustomIDEComps}
procedure TComponentPalette.RegisterCustomIDEComponents( procedure TComponentPalette.RegisterCustomIDEComponents(
const RegisterProc: RegisterUnitComponentProc); const RegisterProc: RegisterUnitComponentProc);