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

Formatting

Browse Source 
git-svn-id: trunk@42570 -
This commit is contained in:
juha 2013-09-03 12:02:02 +00:00
parent 58e5119173
commit 31b1199fa8
3 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
components/ideintf/componentreg.pas
View File

@ -39,7 +39,7 @@ type
end; end;
const const
ComponentPriorityNormal: TComponentPriority = (Category: cpNormal; Level:0); ComponentPriorityNormal: TComponentPriority = (Category: cpNormal; Level: 0);
LCLCompPriority: TComponentPriority = (Category: cpBase; Level: 10); LCLCompPriority: TComponentPriority = (Category: cpBase; Level: 10);
FCLCompPriority: TComponentPriority = (Category: cpBase; Level: 9); FCLCompPriority: TComponentPriority = (Category: cpBase; Level: 9);
@ -60,13 +60,12 @@ type
FOnGetCreationClass: TOnGetCreationClass; FOnGetCreationClass: TOnGetCreationClass;
FPage: TBaseComponentPage; FPage: TBaseComponentPage;
FPageName: string; FPageName: string;
protected
FVisible: boolean; FVisible: boolean;
protected
procedure SetVisible(const AValue: boolean); virtual; procedure SetVisible(const AValue: boolean); virtual;
procedure FreeButton; procedure FreeButton;
public public
constructor Create(TheComponentClass: TComponentClass; constructor Create(TheComponentClass: TComponentClass; const ThePageName: string);
const ThePageName: string);
destructor Destroy; override; destructor Destroy; override;
procedure ConsistencyCheck; virtual; procedure ConsistencyCheck; virtual;
function GetUnitName: string; virtual; abstract; function GetUnitName: string; virtual; abstract;
@ -77,12 +76,12 @@ type
function IsTControl: boolean; function IsTControl: boolean;
public public
property ComponentClass: TComponentClass read FComponentClass; property ComponentClass: TComponentClass read FComponentClass;
property OnGetCreationClass: TOnGetCreationClass read FOnGetCreationClass
write FOnGetCreationClass;
property PageName: string read FPageName; property PageName: string read FPageName;
property Page: TBaseComponentPage read FPage write FPage; property Page: TBaseComponentPage read FPage write FPage;
property Button: TComponent read FButton write FButton; property Button: TComponent read FButton write FButton;
property Visible: boolean read FVisible write SetVisible; property Visible: boolean read FVisible write SetVisible;
property OnGetCreationClass: TOnGetCreationClass read FOnGetCreationClass
write FOnGetCreationClass;
end; end;
TRegisteredComponentClass = class of TRegisteredComponent; TRegisteredComponentClass = class of TRegisteredComponent;
@ -97,9 +96,9 @@ type
FPalette: TBaseComponentPalette; FPalette: TBaseComponentPalette;
FPriority: TComponentPriority; FPriority: TComponentPriority;
FSelectButton: TComponent; FSelectButton: TComponent;
FVisible: boolean;
function GetItems(Index: integer): TRegisteredComponent; function GetItems(Index: integer): TRegisteredComponent;
protected protected
FVisible: boolean;
procedure SetVisible(const AValue: boolean); virtual; procedure SetVisible(const AValue: boolean); virtual;
procedure OnComponentVisibleChanged(AComponent: TRegisteredComponent); virtual; procedure OnComponentVisibleChanged(AComponent: TRegisteredComponent); virtual;
public public
@ -134,8 +133,7 @@ type
cphtComponentAdded // Typically selection is changed after component was added. cphtComponentAdded // Typically selection is changed after component was added.
); );
TEndUpdatePaletteEvent = TEndUpdatePaletteEvent = procedure(Sender: TObject; PaletteChanged: boolean) of object;
procedure(Sender: TObject; PaletteChanged: boolean) of object;
TGetComponentClass = procedure(const AClass: TComponentClass) of object; TGetComponentClass = procedure(const AClass: TComponentClass) of object;
TUpdateCompVisibleEvent = procedure(AComponent: TRegisteredComponent; TUpdateCompVisibleEvent = procedure(AComponent: TRegisteredComponent;
var VoteVisible: integer { Visible>0 } ) of object; var VoteVisible: integer { Visible>0 } ) of object;
@ -145,13 +143,13 @@ type
TBaseComponentPalette = class TBaseComponentPalette = class
private private
FItems: TList; // list of TBaseComponentPage
FHandlers: array[TComponentPaletteHandlerType] of TMethodList; FHandlers: array[TComponentPaletteHandlerType] of TMethodList;
FBaseComponentPageClass: TBaseComponentPageClass; FBaseComponentPageClass: TBaseComponentPageClass;
FHideControls: boolean; FRegisteredComponentClass: TRegisteredComponentClass;
FItems: TList; // list of TBaseComponentPage
FOnBeginUpdate: TNotifyEvent; FOnBeginUpdate: TNotifyEvent;
FOnEndUpdate: TEndUpdatePaletteEvent; FOnEndUpdate: TEndUpdatePaletteEvent;
FRegisteredComponentClass: TRegisteredComponentClass; FHideControls: boolean;
FUpdateLock: integer; FUpdateLock: integer;
fChanged: boolean; fChanged: boolean;
function GetItems(Index: integer): TBaseComponentPage; function GetItems(Index: integer): TBaseComponentPage;
@ -167,16 +165,13 @@ type
procedure OnPageAddedComponent(Component: TRegisteredComponent); virtual; procedure OnPageAddedComponent(Component: TRegisteredComponent); virtual;
procedure OnPageRemovedComponent(Page: TBaseComponentPage; procedure OnPageRemovedComponent(Page: TBaseComponentPage;
Component: TRegisteredComponent); virtual; Component: TRegisteredComponent); virtual;
procedure OnComponentVisibleChanged( procedure OnComponentVisibleChanged(AComponent: TRegisteredComponent); virtual;
AComponent: TRegisteredComponent); virtual;
procedure OnPageVisibleChanged(APage: TBaseComponentPage); virtual; procedure OnPageVisibleChanged(APage: TBaseComponentPage); virtual;
procedure Update; virtual; procedure Update; virtual;
procedure UpdateVisible(AComponent: TRegisteredComponent); virtual; procedure UpdateVisible(AComponent: TRegisteredComponent); virtual;
function GetSelected: TRegisteredComponent; virtual; function GetSelected: TRegisteredComponent; virtual;
procedure SetBaseComponentPageClass( procedure SetBaseComponentPageClass(const AValue: TBaseComponentPageClass); virtual;
const AValue: TBaseComponentPageClass); virtual; procedure SetRegisteredComponentClass(const AValue: TRegisteredComponentClass); virtual;
procedure SetRegisteredComponentClass(
const AValue: TRegisteredComponentClass); virtual;
procedure SetSelected(const AValue: TRegisteredComponent); virtual; procedure SetSelected(const AValue: TRegisteredComponent); virtual;
public public
constructor Create; constructor Create;
@ -216,15 +211,15 @@ type
const OnComponentAddedEvent: TComponentAddedEvent); const OnComponentAddedEvent: TComponentAddedEvent);
public public
property Pages[Index: integer]: TBaseComponentPage read GetItems; default; property Pages[Index: integer]: TBaseComponentPage read GetItems; default;
property BaseComponentPageClass: TBaseComponentPageClass
read FBaseComponentPageClass;
property RegisteredComponentClass: TRegisteredComponentClass
read FRegisteredComponentClass;
property UpdateLock: integer read FUpdateLock; property UpdateLock: integer read FUpdateLock;
property OnBeginUpdate: TNotifyEvent read FOnBeginUpdate property OnBeginUpdate: TNotifyEvent read FOnBeginUpdate
write FOnBeginUpdate; write FOnBeginUpdate;
property OnEndUpdate: TEndUpdatePaletteEvent read FOnEndUpdate property OnEndUpdate: TEndUpdatePaletteEvent read FOnEndUpdate
write FOnEndUpdate; write FOnEndUpdate;
property BaseComponentPageClass: TBaseComponentPageClass
read FBaseComponentPageClass;
property RegisteredComponentClass: TRegisteredComponentClass
read FRegisteredComponentClass;
property HideControls: boolean read FHideControls write SetHideControls; property HideControls: boolean read FHideControls write SetHideControls;
property Selected: TRegisteredComponent read GetSelected write SetSelected; property Selected: TRegisteredComponent read GetSelected write SetSelected;
end; end;
@ -289,7 +284,8 @@ procedure TRegisteredComponent.SetVisible(const AValue: boolean);
begin begin
if FVisible=AValue then exit; if FVisible=AValue then exit;
FVisible:=AValue; FVisible:=AValue;
if (FPage<>nil) then FPage.OnComponentVisibleChanged(Self); if (FPage<>nil) then
FPage.OnComponentVisibleChanged(Self);
end; end;
procedure TRegisteredComponent.FreeButton; procedure TRegisteredComponent.FreeButton;
@ -308,7 +304,8 @@ end;
destructor TRegisteredComponent.Destroy; destructor TRegisteredComponent.Destroy;
begin begin
if FPage<>nil then FPage.Remove(Self); if FPage<>nil then
FPage.Remove(Self);
FreeButton; FreeButton;
inherited Destroy; inherited Destroy;
end; end;
@ -359,13 +356,15 @@ procedure TBaseComponentPage.SetVisible(const AValue: boolean);
begin begin
if FVisible=AValue then exit; if FVisible=AValue then exit;
FVisible:=AValue; FVisible:=AValue;
if (FPalette<>nil) then FPalette.OnPageVisibleChanged(Self); if (FPalette<>nil) then
FPalette.OnPageVisibleChanged(Self);
end; end;
procedure TBaseComponentPage.OnComponentVisibleChanged( procedure TBaseComponentPage.OnComponentVisibleChanged(
AComponent: TRegisteredComponent); AComponent: TRegisteredComponent);
begin begin
if FPalette<>nil then FPalette.OnComponentVisibleChanged(AComponent); if FPalette<>nil then
FPalette.OnComponentVisibleChanged(AComponent);
end; end;
constructor TBaseComponentPage.Create(const ThePageName: string); constructor TBaseComponentPage.Create(const ThePageName: string);
@ -378,12 +377,9 @@ end;
destructor TBaseComponentPage.Destroy; destructor TBaseComponentPage.Destroy;
begin begin
Clear; Clear;
FPageComponent.Free; FreeAndNil(FPageComponent);
FPageComponent:=nil; FreeAndNil(FSelectButton);
FSelectButton.Free; FreeAndNil(FItems);
FSelectButton:=nil;
FItems.Free;
FItems:=nil;
inherited Destroy; inherited Destroy;
end; end;
@ -392,7 +388,8 @@ var
i: Integer; i: Integer;
begin begin
ClearButtons; ClearButtons;
for i:=0 to FItems.Count-1 do Items[i].Page:=nil; for i:=0 to FItems.Count-1 do
Items[i].Page:=nil;
FItems.Clear; FItems.Clear;
end; end;
@ -402,9 +399,9 @@ var
i: Integer; i: Integer;
begin begin
Cnt:=Count; Cnt:=Count;
for i:=0 to Cnt-1 do Items[i].FreeButton; for i:=0 to Cnt-1 do
FSelectButton.Free; Items[i].FreeButton;
FSelectButton:=nil; FreeAndNil(FSelectButton);
end; end;
procedure TBaseComponentPage.ConsistencyCheck; procedure TBaseComponentPage.ConsistencyCheck;
@ -429,14 +426,16 @@ begin
inc(InsertIndex); inc(InsertIndex);
FItems.Insert(InsertIndex,NewComponent); FItems.Insert(InsertIndex,NewComponent);
NewComponent.Page:=Self; NewComponent.Page:=Self;
if FPalette<>nil then FPalette.OnPageAddedComponent(NewComponent); if FPalette<>nil then
FPalette.OnPageAddedComponent(NewComponent);
end; end;
procedure TBaseComponentPage.Remove(AComponent: TRegisteredComponent); procedure TBaseComponentPage.Remove(AComponent: TRegisteredComponent);
begin begin
FItems.Remove(AComponent); FItems.Remove(AComponent);
AComponent.Page:=nil; AComponent.Page:=nil;
if FPalette<>nil then FPalette.OnPageRemovedComponent(Self,AComponent); if FPalette<>nil then
FPalette.OnPageRemovedComponent(Self,AComponent);
end; end;
function TBaseComponentPage.FindComponent(const CompClassName: string function TBaseComponentPage.FindComponent(const CompClassName: string
@ -452,8 +451,7 @@ begin
Result:=nil; Result:=nil;
end; end;
function TBaseComponentPage.FindButton(Button: TComponent function TBaseComponentPage.FindButton(Button: TComponent): TRegisteredComponent;
): TRegisteredComponent;
var var
i: Integer; i: Integer;
begin begin
@ -500,9 +498,8 @@ begin
Result:=TBaseComponentPage(FItems[Index]); Result:=TBaseComponentPage(FItems[Index]);
end; end;
procedure TBaseComponentPalette.AddHandler( procedure TBaseComponentPalette.AddHandler(HandlerType: TComponentPaletteHandlerType;
HandlerType: TComponentPaletteHandlerType; const AMethod: TMethod; const AMethod: TMethod; AsLast: boolean);
AsLast: boolean);
begin begin
if FHandlers[HandlerType]=nil then if FHandlers[HandlerType]=nil then
FHandlers[HandlerType]:=TMethodList.Create; FHandlers[HandlerType]:=TMethodList.Create;
@ -514,8 +511,8 @@ begin
result := nil; result := nil;
end; end;
procedure TBaseComponentPalette.RemoveHandler( procedure TBaseComponentPalette.RemoveHandler(HandlerType: TComponentPaletteHandlerType;
HandlerType: TComponentPaletteHandlerType; const AMethod: TMethod); const AMethod: TMethod);
begin begin
FHandlers[HandlerType].Remove(AMethod); FHandlers[HandlerType].Remove(AMethod);
end; end;
@ -580,8 +577,7 @@ end;
procedure TBaseComponentPalette.UpdateVisible(AComponent: TRegisteredComponent); procedure TBaseComponentPalette.UpdateVisible(AComponent: TRegisteredComponent);
var var
Vote: Integer; i, Vote: Integer;
i: LongInt;
begin begin
Vote:=1; Vote:=1;
if HideControls and AComponent.IsTControl then dec(Vote); if HideControls and AComponent.IsTControl then dec(Vote);
@ -635,7 +631,8 @@ var
i: Integer; i: Integer;
begin begin
Cnt:=Count; Cnt:=Count;
for i:=0 to Cnt-1 do Pages[i].ClearButtons; for i:=0 to Cnt-1 do
Pages[i].ClearButtons;
end; end;
procedure TBaseComponentPalette.BeginUpdate(Change: boolean); procedure TBaseComponentPalette.BeginUpdate(Change: boolean);
@ -698,12 +695,10 @@ begin
end; end;
end; end;
function TBaseComponentPalette.IndexOfPageWithName(const APageName: string function TBaseComponentPalette.IndexOfPageWithName(const APageName: string): integer;
): integer;
begin begin
Result:=Count-1; Result:=Count-1;
while (Result>=0) and (AnsiCompareText(Pages[Result].PageName,APageName)<>0) while (Result>=0) and (AnsiCompareText(Pages[Result].PageName,APageName)<>0) do
do
dec(Result); dec(Result);
end; end;
@ -746,8 +741,7 @@ begin
Result:=nil; Result:=nil;
end; end;
function TBaseComponentPalette.FindButton(Button: TComponent function TBaseComponentPalette.FindButton(Button: TComponent): TRegisteredComponent;
): TRegisteredComponent;
var var
i: Integer; i: Integer;
begin begin
@ -773,8 +767,7 @@ begin
end; end;
end; end;
function TBaseComponentPalette.IndexOfPageComponent(AComponent: TComponent function TBaseComponentPalette.IndexOfPageComponent(AComponent: TComponent): integer;
): integer;
begin begin
if AComponent<>nil then begin if AComponent<>nil then begin
Result:=Count-1; Result:=Count-1;
@ -794,12 +787,10 @@ begin
EndUpdate; EndUpdate;
end; end;
procedure TBaseComponentPalette.IterateRegisteredClasses( procedure TBaseComponentPalette.IterateRegisteredClasses(Proc: TGetComponentClass);
Proc: TGetComponentClass);
var var
i: Integer; i, j: Integer;
APage: TBaseComponentPage; APage: TBaseComponentPage;
j: Integer;
begin begin
for i:=0 to Count-1 do begin for i:=0 to Count-1 do begin
APage:=Pages[i]; APage:=Pages[i];

3
ide/componentpalette.pas
View File

@ -418,7 +418,8 @@ end;
procedure TComponentPalette.DoEndUpdate(Changed: boolean); procedure TComponentPalette.DoEndUpdate(Changed: boolean);
begin begin
if Changed or fNoteBookNeedsUpdate then UpdateNoteBookButtons; if Changed or fNoteBookNeedsUpdate then
UpdateNoteBookButtons;
inherited DoEndUpdate(Changed); inherited DoEndUpdate(Changed);
end; end;

15
packager/packagedefs.pas
View File

@ -190,8 +190,7 @@ type
property Components[Index: integer]: TPkgComponent read GetComponents;// registered components property Components[Index: integer]: TPkgComponent read GetComponents;// registered components
property Directory: string read FDirectory; property Directory: string read FDirectory;
property Flags: TPkgFileFlags read FFlags write SetFlags; property Flags: TPkgFileFlags read FFlags write SetFlags;
property HasRegisterProc: boolean property HasRegisterProc: boolean read GetHasRegisterProc write SetHasRegisterProc;
read GetHasRegisterProc write SetHasRegisterProc;
property LazPackage: TLazPackage read FPackage; property LazPackage: TLazPackage read FPackage;
property SourceDirectoryReferenced: boolean read FSourceDirectoryReferenced; property SourceDirectoryReferenced: boolean read FSourceDirectoryReferenced;
property Unit_Name: string read FUnitName write FUnitName; property Unit_Name: string read FUnitName write FUnitName;
@ -4373,8 +4372,7 @@ begin
if FOutputDir=nil then begin if FOutputDir=nil then begin
FOutputDir:=TDefineTemplate.Create(PkgOutputDirDefTemplName, FOutputDir:=TDefineTemplate.Create(PkgOutputDirDefTemplName,
lisPkgDefsOutputDirectory, '', LazPackage.GetOutputDirectory, da_Directory lisPkgDefsOutputDirectory, '', LazPackage.GetOutputDirectory, da_Directory);
);
FOutputDir.SetDefineOwner(LazPackage,false); FOutputDir.SetDefineOwner(LazPackage,false);
FOutputDir.SetFlags([dtfAutoGenerated],[],false); FOutputDir.SetFlags([dtfAutoGenerated],[],false);
DisableDefaultsInDirectories(FOutputDir,false); DisableDefaultsInDirectories(FOutputDir,false);
@ -4388,8 +4386,7 @@ begin
fLastOutputDirSrcPathIDAsString:=LazPackage.IDAsString; fLastOutputDirSrcPathIDAsString:=LazPackage.IDAsString;
FOutputSrcPath:=TDefineTemplate.Create('CompiledSrcPath', FOutputSrcPath:=TDefineTemplate.Create('CompiledSrcPath',
lisPkgDefsCompiledSrcPathAddition, CompiledSrcPathMacroName, lisPkgDefsCompiledSrcPathAddition, CompiledSrcPathMacroName,
'$PkgSrcPath('+fLastOutputDirSrcPathIDAsString+');' '$PkgSrcPath('+fLastOutputDirSrcPathIDAsString+');'+'$('+CompiledSrcPathMacroName+')',
+'$('+CompiledSrcPathMacroName+')',
da_Define); da_Define);
FOutputSrcPath.SetDefineOwner(LazPackage,false); FOutputSrcPath.SetDefineOwner(LazPackage,false);
FOutputSrcPath.SetFlags([dtfAutoGenerated],[],false); FOutputSrcPath.SetFlags([dtfAutoGenerated],[],false);
@ -4595,8 +4592,7 @@ end;
{ TPkgUnitsTree } { TPkgUnitsTree }
function TPkgUnitsTree.FindNodeWithUnitName(const AUnitName: string function TPkgUnitsTree.FindNodeWithUnitName(const AUnitName: string): TAVLTreeNode;
): TAVLTreeNode;
var var
Comp: integer; Comp: integer;
PkgFile: TPkgFile; PkgFile: TPkgFile;
@ -4614,8 +4610,7 @@ begin
end; end;
end; end;
function TPkgUnitsTree.FindPkgFileWithUnitName(const AUnitName: string function TPkgUnitsTree.FindPkgFileWithUnitName(const AUnitName: string): TPkgFile;
): TPkgFile;
var var
ANode: TAVLTreeNode; ANode: TAVLTreeNode;
begin begin