diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index 8d4cc923..9ae75a13 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -102,7 +102,6 @@ namespace Volian.Controls.Library this.node2 = new DevComponents.AdvTree.Node(); this.nodeConnector2 = new DevComponents.AdvTree.NodeConnector(); this.grpPanSearchResults = new DevComponents.DotNetBar.Controls.GroupPanel(); - this.listViewEx1 = new DevComponents.DotNetBar.Controls.ListViewEx(); this.lbSrchResults = new System.Windows.Forms.ListBox(); this.panSearchButtons = new DevComponents.DotNetBar.PanelEx(); this.btnClearSearchResults = new DevComponents.DotNetBar.ButtonX(); @@ -935,7 +934,6 @@ namespace Volian.Controls.Library // this.grpPanSearchResults.CanvasColor = System.Drawing.SystemColors.Control; this.grpPanSearchResults.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; - this.grpPanSearchResults.Controls.Add(this.listViewEx1); this.grpPanSearchResults.Controls.Add(this.lbSrchResults); this.grpPanSearchResults.Dock = System.Windows.Forms.DockStyle.Fill; this.grpPanSearchResults.Location = new System.Drawing.Point(0, 585); @@ -976,19 +974,6 @@ namespace Volian.Controls.Library this.grpPanSearchResults.TabIndex = 3; this.grpPanSearchResults.Text = "Search Results"; // - // listViewEx1 - // - // - // - // - this.listViewEx1.Border.Class = "ListViewBorder"; - this.listViewEx1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.listViewEx1.Location = new System.Drawing.Point(288, 40); - this.listViewEx1.Name = "listViewEx1"; - this.listViewEx1.Size = new System.Drawing.Size(121, 97); - this.listViewEx1.TabIndex = 1; - this.listViewEx1.UseCompatibleStateImageBehavior = false; - // // lbSrchResults // this.lbSrchResults.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1346,8 +1331,7 @@ namespace Volian.Controls.Library private DevComponents.DotNetBar.ButtonItem btnNOT; private DevComponents.DotNetBar.ButtonX btnCopySearchResults; private DevComponents.DotNetBar.ButtonX btnPrnSrchRslts; - private DevComponents.DotNetBar.ButtonX btnClearSearchResults; - private DevComponents.DotNetBar.Controls.ListViewEx listViewEx1; + private DevComponents.DotNetBar.ButtonX btnClearSearchResults; } } diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 4e42c70d..0a6aca1b 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -264,7 +264,7 @@ namespace Volian.Controls.Library topnode.Text = "Available Procedure Sets"; topnode.Tag = fi; advTreeProcSets.Nodes.Add(topnode); - + //advTreeProcSets.AfterNodeInsert += new TreeNodeCollectionEventHandler(advTreeProcSets_AfterNodeInsert); foreach (FolderInfo fic in fi.ChildFolders) @@ -322,6 +322,19 @@ namespace Volian.Controls.Library cbxTextSearchText.Focus(); // set initial focus to enter search text } + //void advTreeProcSets_AfterNodeInsert(object sender, TreeNodeCollectionEventArgs e) + //{ + // IVEDrillDownReadOnly tmp = e.Node.Tag as IVEDrillDownReadOnly; + // if (tmp != null) + // { + // Console.WriteLine("Has Children {0} {1}", tmp.HasChildren, tmp.ToString()); + // FolderInfo fi = tmp as FolderInfo; + // //if (fi != null) + // // Console.WriteLine("dvi Count {0}", fi.FolderDocVersionCount); + // } + // vlnStackTrace.ShowStackLocal(e.Node.Text,1,10); + //} + void advTreeProcSets_BeforeExpand(object sender, DevComponents.AdvTree.AdvTreeNodeCancelEventArgs e) { DevComponents.AdvTree.Node par = e.Node; @@ -340,8 +353,8 @@ namespace Volian.Controls.Library { DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = fic.ToString(); - par.Nodes.Add(newnode); newnode.Tag = fic; + par.Nodes.Add(newnode); if (fic.HasChildren) // allow for '+' for tree expansion { DevComponents.AdvTree.Node tnt = new DevComponents.AdvTree.Node(); diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index 29f1ebc3..6d65ebd2 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -262,6 +262,9 @@ namespace Volian.Controls.Library { e.RemoveDockTab = true; _RemovedDisplayTabItems.Add((DisplayTabItem)e.DockContainerItem); + DisplayTabItem dti = e.DockContainerItem as DisplayTabItem; + if (dti != null && dti.MyStepTabPanel != null) + dti.MyStepTabPanel.MyStepPanel.Dispose(); DisplayTabItem myTabItem = e.DockContainerItem as DisplayTabItem; if (myTabItem != null) {