Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Tree node fixes when deleting nodes

Browse Source
This commit is contained in:
John Jenko 2010-01-15 17:05:41 +00:00
parent 61c9d01516
commit cdf14f6328
5 changed files with 120 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@ -32,7 +32,7 @@ namespace VEPROMS
private bool _panelExpandedChanging = false; private bool _panelExpandedChanging = false;
Color _CommentTitleBckColor; Color _CommentTitleBckColor;
DocVersionInfo _SelectedDVI = null; DocVersionInfo _SelectedDVI = null;
StepTabPanel _SelectedStepTabPanel=null; StepTabPanel _SelectedStepTabPanel = null;
public FindReplace dlgFindReplace = null; public FindReplace dlgFindReplace = null;
public StepTabPanel SelectedStepTabPanel public StepTabPanel SelectedStepTabPanel
@ -46,6 +46,7 @@ namespace VEPROMS
_SelectedStepTabPanel = value; _SelectedStepTabPanel = value;
if (value == null) // DSO Tab Panel if (value == null) // DSO Tab Panel
{ {
//dlgFindReplace.Visible = false; // Find/Replace dialog should not be visable for DSO tab panels
if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyItemInfo != null) // 2nd part is for unassociated libdocs if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.MyItemInfo != null) // 2nd part is for unassociated libdocs
SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.ActiveParent.ActiveParent as DocVersionInfo; SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.ActiveParent.ActiveParent as DocVersionInfo;
else else
@ -76,7 +77,7 @@ namespace VEPROMS
{ {
get get
{ {
if(_SelectedROFst == null && SelectedDVI != null) if (_SelectedROFst == null && SelectedDVI != null)
_SelectedROFst = SelectedDVI.DocVersionAssociations[0].MyROFst; _SelectedROFst = SelectedDVI.DocVersionAssociations[0].MyROFst;
return _SelectedROFst; return _SelectedROFst;
} }
@ -132,7 +133,7 @@ namespace VEPROMS
epAnnotations.Expanded = false; epAnnotations.Expanded = false;
infoPanel.Expanded = false; infoPanel.Expanded = false;
toolsPanel.Expanded = false; toolsPanel.Expanded = false;
ribbonControl1.ExpandedChanged +=new EventHandler(ribbonControl1_ExpandedChanged); ribbonControl1.ExpandedChanged += new EventHandler(ribbonControl1_ExpandedChanged);
dlgFindReplace = new FindReplace(); dlgFindReplace = new FindReplace();
} }
@ -330,6 +331,8 @@ namespace VEPROMS
} }
else else
{ {
if (tn != null && tn.Bounds.Left < newPoint.X + 30)
return;
if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.SelectedItemInfo != null) if (tc.SelectedDisplayTabItem != null && tc.SelectedDisplayTabItem.SelectedItemInfo != null)
{ {
tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo); tv.AdjustTree(tc.SelectedDisplayTabItem.SelectedItemInfo);
@ -651,7 +654,7 @@ namespace VEPROMS
if (!epProcedures.Expanded) // If panel not expanded - expand it. if (!epProcedures.Expanded) // If panel not expanded - expand it.
{ {
epProcedures.Expanded = true; epProcedures.Expanded = true;
if(tv.Nodes.Count > 0 && tv.SelectedNode==null) if (tv.Nodes.Count > 0 && tv.SelectedNode == null)
tv.SelectedNode = tv.Nodes[0]; tv.SelectedNode = tv.Nodes[0];
tv.Focus(); tv.Focus();
} }
@ -784,7 +787,7 @@ namespace VEPROMS
private void tc_WordSectionDeleted(object sender, WordSectionEventArgs args) private void tc_WordSectionDeleted(object sender, WordSectionEventArgs args)
{ {
// is it a library document - if so and libdoc panel is visible, update lists on panel. // is it a library document - if so and libdoc panel is visible, update lists on panel.
if ((!args.MySectionInfo.IsStepSection) && ((args.MySectionInfo.MyContent.MyEntry.MyDocument.LibTitle ?? "")!="") && (toolsPanel.Expanded)) if ((!args.MySectionInfo.IsStepSection) && ((args.MySectionInfo.MyContent.MyEntry.MyDocument.LibTitle ?? "") != "") && (toolsPanel.Expanded))
{ {
if (toolsTabs.SelectedTab == tabItemLibDocs) if (toolsTabs.SelectedTab == tabItemLibDocs)
{ {
@ -824,6 +827,7 @@ namespace VEPROMS
else if (args.PanelTabName == "FndRpl") else if (args.PanelTabName == "FndRpl")
{ {
dlgFindReplace.InApproved = (_SelectedDVI != null && _SelectedDVI.VersionType == 127); dlgFindReplace.InApproved = (_SelectedDVI != null && _SelectedDVI.VersionType == 127);
//dlgFindReplace.Mydocversion = _SelectedDVI;
dlgFindReplace.Visible = true; dlgFindReplace.Visible = true;
} }
} }
@ -892,7 +896,7 @@ namespace VEPROMS
_CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted); _CurrentItem.Deleted += new ItemInfoEvent(_CurrentItem_Deleted);
dlgFindReplace.MyStepItem = args.MyStepItem; dlgFindReplace.MyStepItem = args.MyStepItem;
} }
if(tc.SelectedDisplayTabItem != null) if (tc.SelectedDisplayTabItem != null)
SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel; SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel;
} }
ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem); ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
@ -986,7 +990,7 @@ namespace VEPROMS
} }
// if at top, 'VE-PROMS', folder and childfolders below this only // if at top, 'VE-PROMS', folder and childfolders below this only
// option is to create a new (sub)folder, i.e. no submenu items. // option is to create a new (sub)folder, i.e. no submenu items.
if (fi.ChildFolderCount > 0 && fi.MyParent==null) return; if (fi.ChildFolderCount > 0 && fi.MyParent == null) return;
//if (fi.ChildFolderCount == 0) // submenu folders/docversion //if (fi.ChildFolderCount == 0) // submenu folders/docversion
//{ //{
if (fi.MyParent != null) if (fi.MyParent != null)
@ -1170,7 +1174,7 @@ namespace VEPROMS
private void ribbonControl1_ExpandedChanged(object sender, EventArgs e) private void ribbonControl1_ExpandedChanged(object sender, EventArgs e)
{ {
Console.WriteLine("Size {0}",ribbonControl1.Expanded); Console.WriteLine("Size {0}", ribbonControl1.Expanded);
// TODO: Need to send message to all StepTabPanels and tell them to minimize their ribbons. // TODO: Need to send message to all StepTabPanels and tell them to minimize their ribbons.
tc.RibbonExpanded = ribbonControl1.Expanded; tc.RibbonExpanded = ribbonControl1.Expanded;
} }
@ -1257,9 +1261,5 @@ namespace VEPROMS
StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily; StepRTB.MyFontFamily = cmbFont.SelectedValue as FontFamily;
} }
//protected override void WndProc(ref Message m)
//{
// base.WndProc(ref m);
//}
} }
} }

2
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -1078,7 +1078,7 @@ namespace VEPROMS.CSLA.Library
string number = (MyContent.Type >= 20000 ? Ordinal.ToString() + "." : ((MyContent.Number ?? "") == "" ? MyContent.Text : MyContent.Number)); string number = (MyContent.Type >= 20000 ? Ordinal.ToString() + "." : ((MyContent.Number ?? "") == "" ? MyContent.Text : MyContent.Number));
ItemInfo parent = this; ItemInfo parent = this;
while (parent.MyPrevious != null) parent = parent.MyPrevious; while (parent.MyPrevious != null) parent = parent.MyPrevious;
if (parent.ItemPartCount == 0) if (parent.ItemPartCount <= 0 || parent.ItemParts.Count == 0)
return null; return null;
else else
{ {

14
PROMS/VEPROMS.CSLA.Library/Extension/ItemInsertExt.cs
View File

@ -183,6 +183,20 @@ namespace VEPROMS.CSLA.Library
internal void OnDeleted(object sender) internal void OnDeleted(object sender)
{ {
if (Deleted != null) Deleted(sender); if (Deleted != null) Deleted(sender);
if (MyParent != null) MyParent.OnChildrenDeleted(sender);
}
public event ItemInfoEvent ChildrenDeleted;
internal void OnChildrenDeleted(object sender)
{
if (_CacheByPrimaryKey.ContainsKey(ItemID.ToString()))
{
List<ItemInfo> itmlst = _CacheByPrimaryKey[ItemID.ToString()];
foreach (ItemInfo itm in itmlst)
if (itm.ChildrenDeleted != null)
{
itm.ChildrenDeleted(itm);
}
}
} }
public event ItemInfoInsertEvent NewSiblingAfter; public event ItemInfoInsertEvent NewSiblingAfter;
internal void OnNewSiblingAfter(object sender, ItemInfoInsertEventArgs args) internal void OnNewSiblingAfter(object sender, ItemInfoInsertEventArgs args)

15
PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs
View File

@ -323,12 +323,24 @@ namespace VEPROMS.CSLA.Library
if (myItemInfo != null) if (myItemInfo != null)
{ {
myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted); myItemInfo.Deleted += new ItemInfoEvent(myItemInfo_Deleted);
myItemInfo.ChildrenDeleted += new ItemInfoEvent(myItemInfo_ChildrenDeleted);
myItemInfo.MyContent.Changed += new ContentInfoEvent(MyContent_Changed); myItemInfo.MyContent.Changed += new ContentInfoEvent(MyContent_Changed);
myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter); myItemInfo.NewSiblingAfter += new ItemInfoInsertEvent(myItemInfo_NewSiblingAfter);
myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore); myItemInfo.NewSiblingBefore += new ItemInfoInsertEvent(myItemInfo_NewSiblingBefore);
myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild); myItemInfo.NewChild += new ItemInfoInsertEvent(myItemInfo_NewChild);
} }
} }
void myItemInfo_ChildrenDeleted(object sender)
{
//Console.WriteLine("Fix Children");
ItemInfo myItemInfo = VEObject as ItemInfo;
//if (Nodes.Count > 1)
// Console.WriteLine("{0}, {1}",Nodes[0], Nodes[1]);
if (!myItemInfo.HasChildren && !(Nodes[0] is VETreeNode))
Nodes.Clear();
}
void myItemInfo_NewChild(object sender, ItemInfoInsertEventArgs args) void myItemInfo_NewChild(object sender, ItemInfoInsertEventArgs args)
{ {
bool isExpanded = IsExpanded; bool isExpanded = IsExpanded;
@ -337,7 +349,8 @@ namespace VEPROMS.CSLA.Library
Nodes.Clear(); Nodes.Clear();
_ChildrenLoaded = false; _ChildrenLoaded = false;
ResetNode("Dummy myItemInfo_NewChild"); ResetNode("Dummy myItemInfo_NewChild");
if (isExpanded) Expand(); //if (isExpanded) Expand();
Collapse();
} }
void myItemInfo_NewSiblingBefore(object sender, ItemInfoInsertEventArgs args) void myItemInfo_NewSiblingBefore(object sender, ItemInfoInsertEventArgs args)
{ {

17
PROMS/Volian.Controls.Library/vlnTreeView.cs
View File

@ -1637,10 +1637,13 @@ namespace Volian.Controls.Library
{ {
// start at the top parent and walk down the nodes to find child // start at the top parent and walk down the nodes to find child
VETreeNode node = FindNodeAndExpand(selectedItem); VETreeNode node = FindNodeAndExpand(selectedItem);
if (node != null)
{
_AdjustingTree = true; _AdjustingTree = true;
this.SelectedNode = node; this.SelectedNode = node;
_AdjustingTree = false; _AdjustingTree = false;
} }
}
public VETreeNode FindNodeAndExpand(IVEDrillDownReadOnly selectedItem) public VETreeNode FindNodeAndExpand(IVEDrillDownReadOnly selectedItem)
{ {
if (selectedItem.ActiveParent == null) if (selectedItem.ActiveParent == null)
@ -1648,15 +1651,23 @@ namespace Volian.Controls.Library
return (VETreeNode)this.Nodes[0]; // Return the top node return (VETreeNode)this.Nodes[0]; // Return the top node
} }
VETreeNode parent = FindNodeAndExpand(selectedItem.ActiveParent); VETreeNode parent = FindNodeAndExpand(selectedItem.ActiveParent);
if (parent == null) return null;
if (!parent.IsExpanded) if (!parent.IsExpanded)
parent.Expand(); parent.Expand();
foreach (VETreeNode child in parent.Nodes) foreach (TreeNode childNode in parent.Nodes)
if (CompareVEObject(child.VEObject, selectedItem)) {
VETreeNode child = childNode as VETreeNode;
if (child != null && CompareVEObject(child.VEObject, selectedItem))
return child; return child;
foreach (VETreeNode child in parent.Nodes) }
foreach (TreeNode childNode in parent.Nodes)
{
VETreeNode child = childNode as VETreeNode;
if (child.VEObject is PartInfo)
foreach (VETreeNode grandchild in child.Nodes) foreach (VETreeNode grandchild in child.Nodes)
if (CompareVEObject(grandchild.VEObject, selectedItem)) if (CompareVEObject(grandchild.VEObject, selectedItem))
return grandchild; return grandchild;
}
return null; return null;
} }
public bool CompareVEObject(IVEDrillDownReadOnly obj1, IVEDrillDownReadOnly obj2) public bool CompareVEObject(IVEDrillDownReadOnly obj1, IVEDrillDownReadOnly obj2)