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

IDE: codeexplorer: clean up

Browse Source 
git-svn-id: trunk@30805 -
This commit is contained in:
mattias 2011-05-19 08:53:39 +00:00
parent d516069165
commit cbb2956bdd
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/codeexplorer.pas
View File

@ -177,7 +177,7 @@ type
fObserverCatNodes: array[TCEObserverCategory] of TTreeNode; fObserverCatNodes: array[TCEObserverCategory] of TTreeNode;
fObserverCatOverflow: array[TCEObserverCategory] of boolean; fObserverCatOverflow: array[TCEObserverCategory] of boolean;
fObserverNode: TTreeNode; fObserverNode: TTreeNode;
fSurroundingsNode: TTreeNode; fSurroundingNode: TTreeNode;
FOnGetDirectivesTree: TOnGetDirectivesTree; FOnGetDirectivesTree: TOnGetDirectivesTree;
FOnJumpToCode: TOnJumpToCode; FOnJumpToCode: TOnJumpToCode;
FOnShowOptions: TNotifyEvent; FOnShowOptions: TNotifyEvent;
@ -226,7 +226,7 @@ type
CodeNode: TCodeTreeNode; StartPos, EndPos: integer; CodeNode: TCodeTreeNode; StartPos, EndPos: integer;
ObserverState: TCodeObserverStatementState); ObserverState: TCodeObserverStatementState);
procedure FindObserverTodos(Tool: TCodeTool); procedure FindObserverTodos(Tool: TCodeTool);
procedure CreateSurroundings(Tool: TCodeTool); procedure CreateSurrounding(Tool: TCodeTool);
procedure DeleteTVNode(TVNode: TTreeNode); procedure DeleteTVNode(TVNode: TTreeNode);
procedure SetCodeFilter(const AValue: string); procedure SetCodeFilter(const AValue: string);
procedure SetCurrentPage(const AValue: TCodeExplorerPage); procedure SetCurrentPage(const AValue: TCodeExplorerPage);
@ -1622,7 +1622,7 @@ begin
until p>SrcLen; until p>SrcLen;
end; end;
procedure TCodeExplorerView.CreateSurroundings(Tool: TCodeTool); procedure TCodeExplorerView.CreateSurrounding(Tool: TCodeTool);
function CTNodeIsEnclosing(CTNOdE: TCodeTreeNode; p: integer): boolean; function CTNodeIsEnclosing(CTNOdE: TCodeTreeNode; p: integer): boolean;
var var
@ -1689,15 +1689,15 @@ var
CurPos: TCodeXYPosition; CurPos: TCodeXYPosition;
p: integer; p: integer;
begin begin
if fSurroundingsNode = nil then if fSurroundingNode = nil then
begin begin
fSurroundingsNode:=CodeTreeview.Items.Add(nil, lisCESurroundings); fSurroundingNode:=CodeTreeview.Items.Add(nil, lisCESurrounding);
Data:=TViewNodeData.Create(Tool.Tree.Root,false); Data:=TViewNodeData.Create(Tool.Tree.Root,false);
Data.Desc:=ctnNone; Data.Desc:=ctnNone;
Data.StartPos:=Tool.SrcLen; Data.StartPos:=Tool.SrcLen;
fSurroundingsNode.Data:=Data; fSurroundingNode.Data:=Data;
fSurroundingsNode.ImageIndex:=ImgIDSection; fSurroundingNode.ImageIndex:=ImgIDSection;
fSurroundingsNode.SelectedIndex:=ImgIDSection; fSurroundingNode.SelectedIndex:=ImgIDSection;
end; end;
CurPos.Code:=FLastCode; CurPos.Code:=FLastCode;
@ -1710,7 +1710,7 @@ begin
while CodeNode<>nil do begin while CodeNode<>nil do begin
Data:=TViewNodeData.Create(CodeNode,false); Data:=TViewNodeData.Create(CodeNode,false);
TVNode:=CodeTreeview.Items.AddChildObject( TVNode:=CodeTreeview.Items.AddChildObject(
fSurroundingsNode,GetCodeNodeDescription(Tool,CodeNode),Data); fSurroundingNode,GetCodeNodeDescription(Tool,CodeNode),Data);
TVNode.ImageIndex:=GetCodeNodeImage(Tool,CodeNode); TVNode.ImageIndex:=GetCodeNodeImage(Tool,CodeNode);
TVNode.SelectedIndex:=TVNode.ImageIndex; TVNode.SelectedIndex:=TVNode.ImageIndex;
if CTNodeIsEnclosing(CodeNode,p) then if CTNodeIsEnclosing(CodeNode,p) then
@ -1719,7 +1719,7 @@ begin
CodeNode:=CodeNode.NextBrother; CodeNode:=CodeNode.NextBrother;
end; end;
fSurroundingsNode.Expanded:=true; fSurroundingNode.Expanded:=true;
end; end;
procedure TCodeExplorerView.DeleteTVNode(TVNode: TTreeNode); procedure TCodeExplorerView.DeleteTVNode(TVNode: TTreeNode);
@ -1735,8 +1735,8 @@ begin
if TVNode.Parent=nil then begin if TVNode.Parent=nil then begin
if TVNode=fObserverNode then if TVNode=fObserverNode then
fObserverNode:=nil fObserverNode:=nil
else if TVNode=fSurroundingsNode then else if TVNode=fSurroundingNode then
fSurroundingsNode:=nil fSurroundingNode:=nil
else begin else begin
for c:=low(fCategoryNodes) to high(fCategoryNodes) do for c:=low(fCategoryNodes) to high(fCategoryNodes) do
if fCategoryNodes[c]=TVNode then if fCategoryNodes[c]=TVNode then
@ -2056,7 +2056,7 @@ begin
fObserverNode:=nil; fObserverNode:=nil;
for f:=low(TCEObserverCategory) to high(TCEObserverCategory) do for f:=low(TCEObserverCategory) to high(TCEObserverCategory) do
fObserverCatNodes[f]:=nil; fObserverCatNodes[f]:=nil;
fSurroundingsNode:=nil; fSurroundingNode:=nil;
CodeTreeview.Items.Clear; CodeTreeview.Items.Clear;
if (ACodeTool<>nil) and (ACodeTool.Tree<>nil) and (ACodeTool.Tree.Root<>nil) if (ACodeTool<>nil) and (ACodeTool.Tree<>nil) and (ACodeTool.Tree.Root<>nil)
@ -2067,7 +2067,7 @@ begin
if (cecCodeObserver in CodeExplorerOptions.Categories) then if (cecCodeObserver in CodeExplorerOptions.Categories) then
CreateObservations(ACodeTool); CreateObservations(ACodeTool);
if (cecSurrounding in CodeExplorerOptions.Categories) then if (cecSurrounding in CodeExplorerOptions.Categories) then
CreateSurroundings(ACodeTool); CreateSurrounding(ACodeTool);
end; end;
end; end;
@ -2379,7 +2379,7 @@ begin
TVNode:=CodeTreeview.Items.GetFirstNode; TVNode:=CodeTreeview.Items.GetFirstNode;
while TVNode<>nil do begin while TVNode<>nil do begin
if TVNode.Parent=nil then begin if TVNode.Parent=nil then begin
if (TVNode=fObserverNode) or (TVNode=fSurroundingsNode) then break; if (TVNode=fObserverNode) or (TVNode=fSurroundingNode) then break;
end; end;
NodeData:=TViewNodeData(TVNode.Data); NodeData:=TViewNodeData(TVNode.Data);
if (NodeData<>nil) and (NodeData.StartPos>0) if (NodeData<>nil) and (NodeData.StartPos>0)

3
ide/lazarusidestrconsts.pas
View File

@ -4363,7 +4363,7 @@ resourcestring
lisNewAncestors = 'New Ancestors'; lisNewAncestors = 'New Ancestors';
lisCEModeShowCategories = 'Show Categories'; lisCEModeShowCategories = 'Show Categories';
lisCEModeShowSourceNodes = 'Show Source Nodes'; lisCEModeShowSourceNodes = 'Show Source Nodes';
lisCESurroundings = 'Surroundings'; lisCESurrounding = 'Surrounding';
lisCEIn = '%s in %s'; lisCEIn = '%s in %s';
lisCEOUpdate = 'Update'; lisCEOUpdate = 'Update';
lisCEORefreshAutomatically = 'Refresh automatically'; lisCEORefreshAutomatically = 'Refresh automatically';
@ -4382,7 +4382,6 @@ resourcestring
lisCEProcedures = 'Procedures'; lisCEProcedures = 'Procedures';
lisCEProperties = 'Properties'; lisCEProperties = 'Properties';
lisCodeObserver = 'Code Observer'; lisCodeObserver = 'Code Observer';
lisCESurrounding = 'Surrounding';
dlgCOMoveLevelDown = 'Move level down'; dlgCOMoveLevelDown = 'Move level down';
dlgCOMoveLevelUp = 'Move level up'; dlgCOMoveLevelUp = 'Move level up';
dlgCOMoveDown = 'Move down'; dlgCOMoveDown = 'Move down';