Find references UI updates. Prevent flicker, prune before tree view. Add close button.

Author: sqlgreen

SSIS/FindUnusedVariables.cs

@@ -50,6 +50,8 @@ public FindUnusedVariables(VariablesDisplayMode displayMode)
         public DialogResult Show(Package package)
         {
             this.selectionList.ClearItems();
+
+            this.progressBar.MarqueeAnimationSpeed = 20;
             this.progressBar.Visible = true;
 
             finder.VariableFound += new EventHandler<VariableFoundEventArgs>(VariableFound);

SSIS/FindVariableReferences.Designer.cs

@@ -39,6 +39,7 @@ public void Show(Package package, Variable variable)
             this.package = package;
             this.variable = variable;
 
+            this.progressBar.MarqueeAnimationSpeed = 20;
             this.progressBar.Visible = true;
 
             InitializeTreeView();
@@ -62,7 +63,6 @@ public void Show(Package package, Parameter parameter)
         private void InitializeTreeView()
         {
             this.treeView.Nodes.Clear();
-            this.treeView.SuspendLayout();
             this.treeView.Enabled = false;
         }
 
@@ -72,35 +72,16 @@ private void VariableFound(object sender, VariableFoundEventArgs e)
             this.processPackage.ReportProgress(0, e);
         }
 
-        private void PruneNodes(TreeNode parent)
-        {
-            for (int index = parent.Nodes.Count -1; index >= 0; index--)
-            {
-                TreeNode node = parent.Nodes[index];
-
-                if (node.IsExpanded || node.Checked)
-                {
-                    PruneNodes(node);
-                }
-                else
-                {
-                    node.Remove();
-                }
-            }
-        }
-
         #region BackgroundWorker Events
 
         private void processPackage_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
             TreeNode parent = this.treeView.Nodes[0];
-            PruneNodes(parent);
 
             stopwatch.Stop();
             this.Text += (" " + stopwatch.ElapsedMilliseconds.ToString());
 
             this.treeView.Enabled = true;            
-            this.treeView.ResumeLayout();
 
             this.progressBar.Visible = false;
         }
@@ -121,5 +102,10 @@ private void SetPropertyGrid(TreeNode node)
         {
             propertyGrid.SelectedObject = node.Tag;
         }
+
+        private void buttonClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
     }
 }

SSIS/FindVariableReferences.cs

@@ -87,9 +87,14 @@ public void FindReferences(Package package, Variable[] variables, TreeView treeV
                 int imageIndex = GetControlFlowImageIndex(PackageHelper.PackageCreationName);
                 TreeNode packageNode = new TreeNode(package.Name, imageIndex, imageIndex);
                 packageNode.Tag = package;
-                AddRootNode(packageNode);
 
                 ProcessObject(package, packageNode);
+
+                // Hide nodes that don't have any matches
+                PruneNodes(packageNode);
+
+                // Add node graph to tree view
+                AddRootNode(packageNode);
             }
             else
             {
@@ -101,6 +106,23 @@ public void FindReferences(Package package, Variable[] variables, TreeView treeV
             this.CancellationPending = false;
         }
 
+        private void PruneNodes(TreeNode parent)
+        {
+            for (int index = parent.Nodes.Count - 1; index >= 0; index--)
+            {
+                TreeNode node = parent.Nodes[index];
+
+                if (node.IsExpanded || node.Checked)
+                {
+                    PruneNodes(node);
+                }
+                else
+                {
+                    node.Remove();
+                }
+            }
+        }
+
         delegate void AddRootNodeCallback(TreeNode node);
 
         private void AddRootNode(TreeNode node)