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

IDE: renamed TCompOptBuildVarsFrame

Browse Source 
git-svn-id: trunk@21406 -
This commit is contained in:
mattias 2009-08-22 21:19:09 +00:00
parent a4eeb8c35c
commit 8115d392f9
6 changed files with 98 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/compileroptionsdlg.lfm
View File

@ -1088,7 +1088,7 @@ object frmCompilerOptions: TfrmCompilerOptions
Align = alTop
ResizeAnchor = akTop
end
inline BuildModesFrame: TCompOptBuildModesFrame
inline BuildVarsFrame: TCompOptBuildVarsFrame
Height = 234
Top = 219
Width = 667
@ -1097,12 +1097,12 @@ object frmCompilerOptions: TfrmCompilerOptions
ClientWidth = 667
TabOrder = 2
Visible = True
inherited BuildModesGroupBox: TGroupBox
inherited BuildVarsGroupBox: TGroupBox
Height = 234
Width = 667
ClientHeight = 215
ClientWidth = 663
inherited BuildModesTreeView: TTreeView
inherited BuildVarsTreeView: TTreeView
Height = 230
Width = 663
DefaultItemHeight = 15

4
ide/compileroptionsdlg.pp
View File

@ -186,7 +186,7 @@ type
ConditionalPage: TPage;
ConditionalOptionsFrame: TCompOptsConditionalsFrame;
ConditionalsGroupBox: TGroupBox;
BuildModesFrame: TCompOptBuildModesFrame;
BuildVarsFrame: TCompOptBuildVarsFrame;
{ Inherited Options }
InheritedPage: TPage;
@ -756,7 +756,7 @@ begin
// conditional
{$IFDEF EnableBuildModes}
ConditionalOptionsFrame.Conditionals:=Options.Conditionals as TCompOptConditionals;
BuildModesFrame.BuildProperties:=Options.BuildProperties as TIDEBuildProperties;
BuildVarsFrame.BuildProperties:=Options.BuildProperties as TIDEBuildProperties;
{$ENDIF}
// inherited tab

2
ide/lazarus.lpi
View File

@ -269,7 +269,7 @@
<Unit33>
<Filename Value="../packager/frames/compiler_buildvar_options.pas"/>
<IsPartOfProject Value="True"/>
<ComponentName Value="CompOptBuildModesFrame"/>
<ComponentName Value="CompOptBuildVarsFrame"/>
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<UnitName Value="Compiler_BuildVar_Options"/>

36
packager/frames/compiler_buildvar_options.lfm
View File

@ -1,42 +1,42 @@
object CompOptBuildModesFrame: TCompOptBuildModesFrame
object CompOptBuildVarsFrame: TCompOptBuildVarsFrame
Left = 0
Height = 233
Top = 0
Width = 492
ClientHeight = 229
ClientWidth = 488
ClientHeight = 233
ClientWidth = 492
TabOrder = 0
Visible = False
DesignLeft = 349
DesignTop = 520
object BuildModesGroupBox: TGroupBox
object BuildVarsGroupBox: TGroupBox
Left = 0
Height = 229
Height = 233
Top = 0
Width = 488
Width = 492
Align = alClient
Caption = 'BuildModesGroupBox'
ClientHeight = 210
ClientWidth = 484
Caption = 'BuildVarsGroupBox'
ClientHeight = 214
ClientWidth = 488
TabOrder = 0
object BuildModesTreeView: TTreeView
object BuildVarsTreeView: TTreeView
Left = 0
Height = 210
Height = 214
Top = 0
Width = 484
Width = 488
Align = alClient
DefaultItemHeight = 19
PopupMenu = BuildModeTVPopupMenu
PopupMenu = BuildVarsTVPopupMenu
RightClickSelect = True
TabOrder = 0
OnEdited = BuildModesTreeViewEdited
OnEditing = BuildModesTreeViewEditing
OnStartDrag = BuildModesTreeViewStartDrag
OnEdited = BuildVarsTreeViewEdited
OnEditing = BuildVarsTreeViewEditing
OnStartDrag = BuildVarsTreeViewStartDrag
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoRightClickSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips]
end
end
object BuildModeTVPopupMenu: TPopupMenu
OnPopup = BuildModeTVPopupMenuPopup
object BuildVarsTVPopupMenu: TPopupMenu
OnPopup = BuildVarsTVPopupMenuPopup
left = 99
top = 77
end

19
packager/frames/compiler_buildvar_options.lrs
View File

@ -0,0 +1,19 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TCompOptBuildVarsFrame','FORMDATA',[
'TPF0'#22'TCompOptBuildVarsFrame'#21'CompOptBuildVarsFrame'#4'Left'#2#0#6'Hei'
+'ght'#3#233#0#3'Top'#2#0#5'Width'#3#236#1#12'ClientHeight'#3#233#0#11'Client'
+'Width'#3#236#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3']'#1#9'DesignT'
+'op'#3#8#2#0#9'TGroupBox'#17'BuildVarsGroupBox'#4'Left'#2#0#6'Height'#3#233#0
+#3'Top'#2#0#5'Width'#3#236#1#5'Align'#7#8'alClient'#7'Caption'#6#17'BuildVar'
+'sGroupBox'#12'ClientHeight'#3#214#0#11'ClientWidth'#3#232#1#8'TabOrder'#2#0
+#0#9'TTreeView'#17'BuildVarsTreeView'#4'Left'#2#0#6'Height'#3#214#0#3'Top'#2
+#0#5'Width'#3#232#1#5'Align'#7#8'alClient'#17'DefaultItemHeight'#2#19#9'Popu'
+'pMenu'#7#20'BuildVarsTVPopupMenu'#16'RightClickSelect'#9#8'TabOrder'#2#0#8
+'OnEdited'#7#23'BuildVarsTreeViewEdited'#9'OnEditing'#7#24'BuildVarsTreeView'
+'Editing'#11'OnStartDrag'#7#26'BuildVarsTreeViewStartDrag'#7'Options'#11#17
+'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes'#19'tvoRig'
+'htClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoTo'
+'olTips'#0#0#0#0#10'TPopupMenu'#20'BuildVarsTVPopupMenu'#7'OnPopup'#7#25'Bui'
+'ldVarsTVPopupMenuPopup'#4'left'#2'c'#3'top'#2'M'#0#0#0
]);

110
packager/frames/compiler_buildvar_options.pas
View File

@ -39,19 +39,19 @@ type
cbmntDefaultValueEditor
);
{ TCompOptBuildModesFrame }
{ TCompOptBuildVarsFrame }
TCompOptBuildModesFrame = class(TFrame)
BuildModesGroupBox: TGroupBox;
BuildModesTreeView: TTreeView;
BuildModeTVPopupMenu: TPopupMenu;
procedure BuildModesTreeViewEdited(Sender: TObject; Node: TTreeNode;
TCompOptBuildVarsFrame = class(TFrame)
BuildVarsGroupBox: TGroupBox;
BuildVarsTreeView: TTreeView;
BuildVarsTVPopupMenu: TPopupMenu;
procedure BuildVarsTreeViewEdited(Sender: TObject; Node: TTreeNode;
var S: string);
procedure BuildModesTreeViewEditing(Sender: TObject; Node: TTreeNode;
procedure BuildVarsTreeViewEditing(Sender: TObject; Node: TTreeNode;
var AllowEdit: Boolean);
procedure BuildModesTreeViewStartDrag(Sender: TObject;
procedure BuildVarsTreeViewStartDrag(Sender: TObject;
var DragObject: TDragObject);
procedure BuildModeTVPopupMenuPopup(Sender: TObject);
procedure BuildVarsTVPopupMenuPopup(Sender: TObject);
procedure DeleteBuildModeClick(Sender: TObject);
procedure NewBuildModeClick(Sender: TObject);
procedure NewValueClick(Sender: TObject);
@ -82,9 +82,9 @@ type
implementation
{ TCompOptBuildModesFrame }
{ TCompOptBuildVarsFrame }
procedure TCompOptBuildModesFrame.NewBuildModeClick(Sender: TObject);
procedure TCompOptBuildVarsFrame.NewBuildModeClick(Sender: TObject);
var
NewIdentifier: String;
NewBuildProperty: TLazBuildProperty;
@ -98,12 +98,12 @@ begin
SetResultNode.ValueType:=cocvtResult;
NewBuildProperty.DefaultValue.Root.AddLast(SetResultNode);
// add to TreeView
BuildModesTreeView.BeginUpdate;
BuildVarsTreeView.BeginUpdate;
TreeViewAddBuildMode(NewBuildProperty);
BuildModesTreeView.EndUpdate;
BuildVarsTreeView.EndUpdate;
end;
procedure TCompOptBuildModesFrame.NewValueClick(Sender: TObject);
procedure TCompOptBuildVarsFrame.NewValueClick(Sender: TObject);
var
BuildProperty: TLazBuildProperty;
NodeType: TCBMNodeType;
@ -120,14 +120,14 @@ begin
inc(i);
until false;
BuildProperty.Values.Add(NewValueStr);
BuildModesTreeView.BeginUpdate;
BuildVarsTreeView.BeginUpdate;
ValuesTVNode:=GetValuesTVNode(BuildProperty);
TreeViewAddValue(ValuesTVNode,NewValueStr);
ValuesTVNode.Expand(true);
BuildModesTreeView.EndUpdate;
BuildVarsTreeView.EndUpdate;
end;
procedure TCompOptBuildModesFrame.DeleteValueClick(Sender: TObject);
procedure TCompOptBuildVarsFrame.DeleteValueClick(Sender: TObject);
var
BuildProperty: TLazBuildProperty;
NodeType: TCBMNodeType;
@ -144,12 +144,12 @@ begin
then exit;
i:=BuildProperty.Values.IndexOf(aValue);
if i>=0 then BuildProperty.Values.Delete(i);
BuildModesTreeView.BeginUpdate;
BuildVarsTreeView.BeginUpdate;
SelTVNode.Delete;
BuildModesTreeView.EndUpdate;
BuildVarsTreeView.EndUpdate;
end;
procedure TCompOptBuildModesFrame.DeleteBuildModeClick(Sender: TObject);
procedure TCompOptBuildVarsFrame.DeleteBuildModeClick(Sender: TObject);
var
BuildProperty: TIDEBuildProperty;
SelTVNode: TTreeNode;
@ -168,12 +168,12 @@ begin
FEditors.Remove(Editor);
Editor.Free;
BuildProperties.Delete(i);
BuildModesTreeView.BeginUpdate;
BuildVarsTreeView.BeginUpdate;
SelTVNode.Delete;
BuildModesTreeView.EndUpdate;
BuildVarsTreeView.EndUpdate;
end;
procedure TCompOptBuildModesFrame.BuildModeTVPopupMenuPopup(Sender: TObject);
procedure TCompOptBuildVarsFrame.BuildVarsTVPopupMenuPopup(Sender: TObject);
var
BuildProperty: TLazBuildProperty;
NodeType: TCBMNodeType;
@ -184,20 +184,20 @@ var
Result:=TMenuItem.Create(Self);
Result.Caption:=aCaption;
Result.OnClick:=OnClickEvent;
BuildModeTVPopupMenu.Items.Add(Result);
BuildVarsTVPopupMenu.Items.Add(Result);
end;
function AddSeparator: TMenuItem;
begin
Result:=nil;
if BuildModeTVPopupMenu.Items.Count=0 then exit;
if BuildVarsTVPopupMenu.Items.Count=0 then exit;
Result:=TMenuItem.Create(Self);
Result.Caption:='-';
BuildModeTVPopupMenu.Items.Add(Result);
BuildVarsTVPopupMenu.Items.Add(Result);
end;
begin
BuildModeTVPopupMenu.Items.Clear;
BuildVarsTVPopupMenu.Items.Clear;
GetSelectedNode(BuildProperty,NodeType);
if NodeType in [cbmntBuildMode,cbmntValues,cbmntValue] then
@ -210,11 +210,11 @@ begin
Add('Delete build mode ...',@DeleteBuildModeClick);
if NodeType in [cbmntDefaultValue,cbmntDefaultValueEditor] then begin
Editor:=GetEditor(BuildProperty);
Editor.FillPopupMenu(BuildModeTVPopupMenu);
Editor.FillPopupMenu(BuildVarsTVPopupMenu);
end;
end;
procedure TCompOptBuildModesFrame.BuildModesTreeViewEditing(Sender: TObject;
procedure TCompOptBuildVarsFrame.BuildVarsTreeViewEditing(Sender: TObject;
Node: TTreeNode; var AllowEdit: Boolean);
var
BuildProperty: TLazBuildProperty;
@ -224,13 +224,13 @@ begin
AllowEdit:=NodeType in [cbmntBuildMode,cbmntValue];
end;
procedure TCompOptBuildModesFrame.BuildModesTreeViewStartDrag(Sender: TObject;
procedure TCompOptBuildVarsFrame.BuildVarsTreeViewStartDrag(Sender: TObject;
var DragObject: TDragObject);
begin
end;
procedure TCompOptBuildModesFrame.BuildModesTreeViewEdited(Sender: TObject;
procedure TCompOptBuildVarsFrame.BuildVarsTreeViewEdited(Sender: TObject;
Node: TTreeNode; var S: string);
var
BuildProperty: TLazBuildProperty;
@ -281,7 +281,7 @@ begin
end;
end;
procedure TCompOptBuildModesFrame.SetBuildProperties(
procedure TCompOptBuildVarsFrame.SetBuildProperties(
const AValue: TIDEBuildProperties);
begin
if FBuildProperties=AValue then exit;
@ -289,22 +289,22 @@ begin
RebuildTreeView;
end;
procedure TCompOptBuildModesFrame.RebuildTreeView;
procedure TCompOptBuildVarsFrame.RebuildTreeView;
var
i: Integer;
begin
BuildModesTreeView.BeginUpdate;
BuildModesTreeView.Items.Clear;
BuildVarsTreeView.BeginUpdate;
BuildVarsTreeView.Items.Clear;
FreeEditors;
if BuildProperties<>nil then begin
// first level: build modes
for i:=0 to BuildProperties.Count-1 do
TreeViewAddBuildMode(BuildProperties.Items[i]);
end;
BuildModesTreeView.EndUpdate;
BuildVarsTreeView.EndUpdate;
end;
procedure TCompOptBuildModesFrame.TreeViewAddBuildMode(
procedure TCompOptBuildVarsFrame.TreeViewAddBuildMode(
BuildProperty: TLazBuildProperty);
var
TVNode: TTreeNode;
@ -315,13 +315,13 @@ var
Editor: TCompOptsExprEditor;
begin
// create node for the build mode
TVNode:=BuildModesTreeView.Items.AddObject(nil,BuildProperty.Identifier,BuildProperty);
TVNode:=BuildVarsTreeView.Items.AddObject(nil,BuildProperty.Identifier,BuildProperty);
TVNode.ImageIndex:=fModeImgID;
TVNode.SelectedIndex:=TVNode.ImageIndex;
// second level
begin
// parent node for values
ValuesTVNode:=BuildModesTreeView.Items.AddChild(TVNode, lisValues);
ValuesTVNode:=BuildVarsTreeView.Items.AddChild(TVNode, lisValues);
ValuesTVNode.ImageIndex:=fValuesImgID;
ValuesTVNode.SelectedIndex:=ValuesTVNode.ImageIndex;
// a node for each value
@ -329,7 +329,7 @@ begin
for i:=0 to Values.Count-1 do
TreeViewAddValue(ValuesTVNode,Values[i]);
// a node for the default value
DefValueTVNode:=BuildModesTreeView.Items.AddChild(TVNode,
DefValueTVNode:=BuildVarsTreeView.Items.AddChild(TVNode,
lisDefaultValue);
DefValueTVNode.ImageIndex:=fDefValueImgID;
DefValueTVNode.SelectedIndex:=DefValueTVNode.ImageIndex;
@ -338,24 +338,24 @@ begin
Editor.DefaultNodeType:=cocntSetValue;
Editor.DefaultValueType:=cocvtResult;
FEditors.Add(Editor);
Editor.Setup(BuildModesTreeView,DefValueTVNode,
Editor.Setup(BuildVarsTreeView,DefValueTVNode,
BuildProperty.DefaultValue as TCompOptConditionals,[cocvtResult]);
end;
//DebugLn(['TCompOptBuildModesFrame.TreeViewAddBuildMode ',TVNode.Text]);
TVNode.Expand(true);
end;
procedure TCompOptBuildModesFrame.TreeViewAddValue(ValuesTVNode: TTreeNode;
procedure TCompOptBuildVarsFrame.TreeViewAddValue(ValuesTVNode: TTreeNode;
aValue: string);
var
ValueTVNode: TTreeNode;
begin
ValueTVNode:=BuildModesTreeView.Items.AddChild(ValuesTVNode,aValue);
ValueTVNode:=BuildVarsTreeView.Items.AddChild(ValuesTVNode,aValue);
ValueTVNode.ImageIndex:=fValueImgID;
ValueTVNode.SelectedIndex:=ValueTVNode.ImageIndex;
end;
function TCompOptBuildModesFrame.GetNodeInfo(Node: TTreeNode; out
function TCompOptBuildVarsFrame.GetNodeInfo(Node: TTreeNode; out
BuildProperty: TLazBuildProperty): TCBMNodeType;
function GetNodeType(CurNode: TTreeNode): TCBMNodeType;
@ -388,22 +388,22 @@ begin
Result:=GetNodeType(Node);
end;
function TCompOptBuildModesFrame.GetSelectedNode(out
function TCompOptBuildVarsFrame.GetSelectedNode(out
BuildProperty: TLazBuildProperty; out NodeType: TCBMNodeType): TTreeNode;
begin
Result:=BuildModesTreeView.Selected;
Result:=BuildVarsTreeView.Selected;
NodeType:=GetNodeInfo(Result,BuildProperty);
end;
function TCompOptBuildModesFrame.GetBuildModeTVNode(BuildProperty: TLazBuildProperty
function TCompOptBuildVarsFrame.GetBuildModeTVNode(BuildProperty: TLazBuildProperty
): TTreeNode;
begin
Result:=BuildModesTreeView.Items.GetFirstNode;
Result:=BuildVarsTreeView.Items.GetFirstNode;
while (Result<>nil) and (TObject(Result.Data)<>BuildProperty) do
Result:=Result.GetNextSibling;
end;
function TCompOptBuildModesFrame.GetValuesTVNode(BuildProperty: TLazBuildProperty
function TCompOptBuildVarsFrame.GetValuesTVNode(BuildProperty: TLazBuildProperty
): TTreeNode;
var
BuildModeTVNode: TTreeNode;
@ -415,7 +415,7 @@ begin
Result:=nil;
end;
procedure TCompOptBuildModesFrame.FreeEditors;
procedure TCompOptBuildVarsFrame.FreeEditors;
var
i: Integer;
begin
@ -424,7 +424,7 @@ begin
FEditors.Clear;
end;
function TCompOptBuildModesFrame.GetEditor(BuildProperty: TLazBuildProperty
function TCompOptBuildVarsFrame.GetEditor(BuildProperty: TLazBuildProperty
): TCompOptsExprEditor;
var
i: Integer;
@ -436,20 +436,20 @@ begin
Result:=nil;
end;
constructor TCompOptBuildModesFrame.Create(TheOwner: TComponent);
constructor TCompOptBuildVarsFrame.Create(TheOwner: TComponent);
begin
inherited Create(TheOwner);
FEditors:=TFPList.Create;
BuildModesTreeView.Images := IDEImages.Images_24;
BuildVarsTreeView.Images := IDEImages.Images_24;
fModeImgID:=IDEImages.LoadImage(24,'da_define');
fValueImgID:=IDEImages.LoadImage(24,'da_define');
fDefValueImgID:=IDEImages.LoadImage(24,'da_define');
BuildModesGroupBox.Caption:='Build modes';
BuildVarsGroupBox.Caption:='Build modes';
end;
destructor TCompOptBuildModesFrame.Destroy;
destructor TCompOptBuildVarsFrame.Destroy;
begin
FreeEditors;
FreeAndNil(FEditors);