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

IDE: renamed build variable to build macro

Browse Source 
git-svn-id: trunk@26865 -
This commit is contained in:
mattias 2010-07-27 18:14:09 +00:00
parent d96cec82dc
commit d9c85f22a8
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ide/frames/compiler_buildmacro_options.pas
View File

@ -65,16 +65,16 @@ type
FEditors: TFPList;// list of TCompOptsExprEditor FEditors: TFPList;// list of TCompOptsExprEditor
procedure SetBuildMacros(const AValue: TIDEBuildMacros); procedure SetBuildMacros(const AValue: TIDEBuildMacros);
procedure RebuildTreeView; procedure RebuildTreeView;
procedure TreeViewAddBuildMacro(BuildProperty: TLazBuildMacro); procedure TreeViewAddBuildMacro(aBuildMacro: TLazBuildMacro);
procedure TreeViewAddValue(ValuesTVNode: TTreeNode; aValue: string); procedure TreeViewAddValue(ValuesTVNode: TTreeNode; aValue: string);
function GetNodeInfo(Node: TTreeNode; out BuildProperty: TLazBuildMacro): TCBMNodeType; function GetNodeInfo(Node: TTreeNode; out BuildProperty: TLazBuildMacro): TCBMNodeType;
function GetSelectedNode(out BuildProperty: TLazBuildMacro; function GetSelectedNode(out aBuildMacro: TLazBuildMacro;
out NodeType: TCBMNodeType): TTreeNode; out NodeType: TCBMNodeType): TTreeNode;
function GetBuildMacroTVNode(BuildProperty: TLazBuildMacro): TTreeNode; function GetBuildMacroTVNode(aBuildMacro: TLazBuildMacro): TTreeNode;
function GetValuesTVNode(BuildProperty: TLazBuildMacro): TTreeNode; function GetValuesTVNode(aBuildMacro: TLazBuildMacro): TTreeNode;
procedure FreeEditors; procedure FreeEditors;
function GetEditor(BuildProperty: TLazBuildMacro): TCompOptsExprEditor; function GetEditor(aBuildMacro: TLazBuildMacro): TCompOptsExprEditor;
function GetVariablePrefix: string; function GetMacroNamePrefix: string;
public public
constructor Create(TheOwner: TComponent); override; constructor Create(TheOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -93,7 +93,7 @@ var
NewBuildMacro: TLazBuildMacro; NewBuildMacro: TLazBuildMacro;
SetResultNode: TCompOptCondNode; SetResultNode: TCompOptCondNode;
begin begin
NewIdentifier:=DefaultBuildModeGraph.GetUniqueVarName(GetVariablePrefix,BuildMacros); NewIdentifier:=DefaultBuildModeGraph.GetUniqueVarName(GetMacroNamePrefix,BuildMacros);
NewBuildMacro:=BuildMacros.Add(NewIdentifier); NewBuildMacro:=BuildMacros.Add(NewIdentifier);
// add a node // add a node
SetResultNode:=TCompOptCondNode.Create(NewBuildMacro.DefaultValue); SetResultNode:=TCompOptCondNode.Create(NewBuildMacro.DefaultValue);
@ -308,7 +308,7 @@ begin
end; end;
procedure TCompOptBuildMacrosFrame.TreeViewAddBuildMacro( procedure TCompOptBuildMacrosFrame.TreeViewAddBuildMacro(
BuildProperty: TLazBuildMacro); aBuildMacro: TLazBuildMacro);
var var
TVNode: TTreeNode; TVNode: TTreeNode;
ValuesTVNode: TTreeNode; ValuesTVNode: TTreeNode;
@ -318,7 +318,7 @@ var
Editor: TCompOptsExprEditor; Editor: TCompOptsExprEditor;
begin begin
// create node for the build macro // create node for the build macro
TVNode:=BuildMacrosTreeView.Items.AddObject(nil,BuildProperty.Identifier,BuildProperty); TVNode:=BuildMacrosTreeView.Items.AddObject(nil,aBuildMacro.Identifier,aBuildMacro);
TVNode.ImageIndex:=fVarImgID; TVNode.ImageIndex:=fVarImgID;
TVNode.SelectedIndex:=TVNode.ImageIndex; TVNode.SelectedIndex:=TVNode.ImageIndex;
// second level // second level
@ -328,7 +328,7 @@ begin
ValuesTVNode.ImageIndex:=fValuesImgID; ValuesTVNode.ImageIndex:=fValuesImgID;
ValuesTVNode.SelectedIndex:=ValuesTVNode.ImageIndex; ValuesTVNode.SelectedIndex:=ValuesTVNode.ImageIndex;
// a node for each value // a node for each value
Values:=BuildProperty.Values; Values:=aBuildMacro.Values;
for i:=0 to Values.Count-1 do for i:=0 to Values.Count-1 do
TreeViewAddValue(ValuesTVNode,Values[i]); TreeViewAddValue(ValuesTVNode,Values[i]);
// a node for the default value // a node for the default value
@ -342,7 +342,7 @@ begin
Editor.DefaultValueType:=cocvtResult; Editor.DefaultValueType:=cocvtResult;
FEditors.Add(Editor); FEditors.Add(Editor);
Editor.Setup(BuildMacrosTreeView,DefValueTVNode, Editor.Setup(BuildMacrosTreeView,DefValueTVNode,
BuildProperty.DefaultValue as TCompOptConditionals,[cocvtResult]); aBuildMacro.DefaultValue as TCompOptConditionals,[cocvtResult]);
end; end;
//DebugLn(['TCompOptBuildMacrosFrame.TreeViewAddBuildMacro ',TVNode.Text]); //DebugLn(['TCompOptBuildMacrosFrame.TreeViewAddBuildMacro ',TVNode.Text]);
TVNode.Expand(true); TVNode.Expand(true);
@ -392,26 +392,26 @@ begin
end; end;
function TCompOptBuildMacrosFrame.GetSelectedNode(out function TCompOptBuildMacrosFrame.GetSelectedNode(out
BuildProperty: TLazBuildMacro; out NodeType: TCBMNodeType): TTreeNode; aBuildMacro: TLazBuildMacro; out NodeType: TCBMNodeType): TTreeNode;
begin begin
Result:=BuildMacrosTreeView.Selected; Result:=BuildMacrosTreeView.Selected;
NodeType:=GetNodeInfo(Result,BuildProperty); NodeType:=GetNodeInfo(Result,aBuildMacro);
end; end;
function TCompOptBuildMacrosFrame.GetBuildMacroTVNode(BuildProperty: TLazBuildMacro function TCompOptBuildMacrosFrame.GetBuildMacroTVNode(aBuildMacro: TLazBuildMacro
): TTreeNode; ): TTreeNode;
begin begin
Result:=BuildMacrosTreeView.Items.GetFirstNode; Result:=BuildMacrosTreeView.Items.GetFirstNode;
while (Result<>nil) and (TObject(Result.Data)<>BuildProperty) do while (Result<>nil) and (TObject(Result.Data)<>aBuildMacro) do
Result:=Result.GetNextSibling; Result:=Result.GetNextSibling;
end; end;
function TCompOptBuildMacrosFrame.GetValuesTVNode(BuildProperty: TLazBuildMacro function TCompOptBuildMacrosFrame.GetValuesTVNode(aBuildMacro: TLazBuildMacro
): TTreeNode; ): TTreeNode;
var var
BuildMacroTVNode: TTreeNode; BuildMacroTVNode: TTreeNode;
begin begin
BuildMacroTVNode:=GetBuildMacroTVNode(BuildProperty); BuildMacroTVNode:=GetBuildMacroTVNode(aBuildMacro);
if (BuildMacroTVNode<>nil) then if (BuildMacroTVNode<>nil) then
Result:=BuildMacroTVNode.GetFirstChild Result:=BuildMacroTVNode.GetFirstChild
else else
@ -427,19 +427,19 @@ begin
FEditors.Clear; FEditors.Clear;
end; end;
function TCompOptBuildMacrosFrame.GetEditor(BuildProperty: TLazBuildMacro function TCompOptBuildMacrosFrame.GetEditor(aBuildMacro: TLazBuildMacro
): TCompOptsExprEditor; ): TCompOptsExprEditor;
var var
i: Integer; i: Integer;
begin begin
for i:=0 to FEditors.Count-1 do begin for i:=0 to FEditors.Count-1 do begin
Result:=TCompOptsExprEditor(FEditors[i]); Result:=TCompOptsExprEditor(FEditors[i]);
if Result.Conditionals=BuildProperty.DefaultValue then exit; if Result.Conditionals=aBuildMacro.DefaultValue then exit;
end; end;
Result:=nil; Result:=nil;
end; end;
function TCompOptBuildMacrosFrame.GetVariablePrefix: string; function TCompOptBuildMacrosFrame.GetMacroNamePrefix: string;
begin begin
Result:='BuildMacro'; Result:='BuildMacro';
if (BuildMacros=nil) or (BuildMacros.Owner=nil) then exit; if (BuildMacros=nil) or (BuildMacros.Owner=nil) then exit;