Missed a spot

Missed a call for expanding the TreeView and removing account-level checkboxes, apparently.
MaeBee · Sep 15, 2017 · b4c5308 · b4c5308
1 parent ddb68c5
commit b4c5308
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 31 deletions.
diff --git a/ESOResearchNotifier/Form1.Designer.cs b/ESOResearchNotifier/Form1.Designer.cs
diff --git a/ESOResearchNotifier/Form1.cs b/ESOResearchNotifier/Form1.cs
@@ -141,6 +141,7 @@ private void ReadDump()
             {
                 MessageBox.Show("No valid data could be found. Please run the ResearchDump addon and /reloadui.\r\nIf the problem persists, delete " + SavedVars + "\\ResearchDump.lua and run the addon.\r\nIf the problem still persists, please file an issue on GitHub, attaching your ResearchDump.lua.");
             }
+            ExpandTree();
         }
 
         private void fileSystemWatcher1_Changed(object sender, System.IO.FileSystemEventArgs e)
@@ -167,12 +168,7 @@ private void menuItemExit_Click(object sender, EventArgs e)
         {
             this.Close();
         }
-
-        private void button1_Click(object sender, EventArgs e)
-        {
-            this.WindowState = FormWindowState.Minimized;
-        }
-
+
         private void Form1_Resize(object sender, EventArgs e)
         {
             if (this.WindowState == FormWindowState.Minimized)
@@ -185,11 +181,7 @@ private void Form1_Resize(object sender, EventArgs e)
                 this.ShowInTaskbar = true;
             }
 
-            foreach (TreeMetaNode Node in treeView1.Nodes)
-            {
-                HideCheckBox(treeView1, Node);
-            }
-            treeView1.ExpandAll();
+            ExpandTree();
         }
 
         private void notifyIcon1_MouseDoubleClick(object sender, MouseEventArgs e)
@@ -227,7 +219,7 @@ private void cboTimeout_SelectedIndexChanged(object sender, EventArgs e)
             XML.WriteData(ConfigPath, Config, SelectedCharacters);
         }
 
-        private void button1_Click_1(object sender, EventArgs e)
+        private void button1_Click(object sender, EventArgs e)
         {
             // Short, 10-second debug research item
             ResearchItem tItem = new ResearchItem();
@@ -336,15 +328,20 @@ private void EvaluateTreeView()
 
             SelectedCharacters = newSelectedCharacters;
             XML.WriteData(ConfigPath, Config, SelectedCharacters);
+            ExpandTree();
         }
 
-        private void Form1_Load(object sender, EventArgs e)
+        private void ExpandTree()
         {
             foreach (TreeMetaNode Node in treeView1.Nodes)
             {
                 HideCheckBox(treeView1, Node);
             }
             treeView1.ExpandAll();
+        }
+
+        private void Form1_Load(object sender, EventArgs e)
+        {
             EvaluateTreeView();
         }
 
@@ -395,7 +392,7 @@ private static extern IntPtr SendMessage(IntPtr hWnd, int Msg, IntPtr wParam,
         /// <summary>
         /// Hides the checkbox for the specified node on a TreeView control.
         /// </summary>
-        private void HideCheckBox(TreeView tvw, TreeMetaNode node)
+        private void HideCheckBox(FixedTreeView tvw, TreeMetaNode node)
         {
             TVITEM tvi = new TVITEM();
             tvi.hItem = node.Handle;