1.1 --- a/GUI/MainForm.cs	Sat Jun 05 11:15:16 2010 +0000
     1.2 +++ b/GUI/MainForm.cs	Sat Jun 05 18:59:54 2010 +0000
     1.3 @@ -57,8 +57,7 @@
     1.4      private IDictionary<ISensor, Color> sensorPlotColors = 
     1.5        new Dictionary<ISensor, Color>();
     1.6      private Color[] plotColorPalette;
     1.7 -    private SensorSystemTray sensorSystemTray;
     1.8 -    private NotifyIcon notifyIcon;
     1.9 +    private SystemTray systemTray;    
    1.10      private StartupManager startupManager = new StartupManager();
    1.11      private UpdateVisitor updateVisitor = new UpdateVisitor();
    1.12  
    1.13 @@ -68,21 +67,13 @@
    1.14        treeView.Font = SystemFonts.MessageBoxFont;
    1.15        plotPanel.Font = SystemFonts.MessageBoxFont;
    1.16        
    1.17 -      nodeCheckBox.IsVisibleValueNeeded += 
    1.18 -        new EventHandler<NodeControlValueEventArgs>(
    1.19 -          nodeCheckBox_IsVisibleValueNeeded);
    1.20 -      nodeCheckBox.CheckStateChanged += 
    1.21 -        new EventHandler<TreePathEventArgs>(UpdatePlotSelection);
    1.22 -      nodeTextBoxText.DrawText += 
    1.23 -        new EventHandler<DrawEventArgs>(nodeTextBoxText_DrawText);
    1.24 -      nodeTextBoxValue.DrawText +=
    1.25 -        new EventHandler<DrawEventArgs>(nodeTextBoxText_DrawText);
    1.26 -      nodeTextBoxMin.DrawText +=
    1.27 -        new EventHandler<DrawEventArgs>(nodeTextBoxText_DrawText);
    1.28 -      nodeTextBoxMax.DrawText +=
    1.29 -        new EventHandler<DrawEventArgs>(nodeTextBoxText_DrawText);
    1.30 -      nodeTextBoxLimit.DrawText += 
    1.31 -        new EventHandler<DrawEventArgs>(nodeTextBoxLimit_DrawText);
    1.32 +      nodeCheckBox.IsVisibleValueNeeded += nodeCheckBox_IsVisibleValueNeeded;
    1.33 +      nodeCheckBox.CheckStateChanged += UpdatePlotSelection;
    1.34 +      nodeTextBoxText.DrawText += nodeTextBoxText_DrawText;
    1.35 +      nodeTextBoxValue.DrawText += nodeTextBoxText_DrawText;
    1.36 +      nodeTextBoxMin.DrawText += nodeTextBoxText_DrawText;
    1.37 +      nodeTextBoxMax.DrawText += nodeTextBoxText_DrawText;
    1.38 +      nodeTextBoxLimit.DrawText += nodeTextBoxLimit_DrawText;
    1.39  
    1.40        if (Utilities.Config.Contains("mainForm.Location.X")) {
    1.41          int x = Utilities.Config.Get("mainForm.Location.X", Location.X);
    1.42 @@ -107,15 +98,11 @@
    1.43        root.Image = Utilities.EmbeddedResources.GetImage("computer.png");
    1.44        
    1.45        treeModel.Nodes.Add(root);
    1.46 -      treeView.Model = treeModel;
    1.47 -      
    1.48 -      notifyIcon = new NotifyIcon();
    1.49 -      notifyIcon.ContextMenuStrip = this.notifyContextMenuStrip;
    1.50 -      notifyIcon.Icon = EmbeddedResources.GetIcon("smallicon.ico");
    1.51 -      notifyIcon.Text = "Open Hardware Monitor";      
    1.52 -      notifyIcon.DoubleClick += new EventHandler(this.hideShowClick);
    1.53 +      treeView.Model = treeModel;     
    1.54  
    1.55 -      sensorSystemTray = new SensorSystemTray(computer);
    1.56 +      systemTray = new SystemTray(computer);
    1.57 +      systemTray.HideShowCommand += hideShowClick;
    1.58 +      systemTray.ExitCommand += exitClick;
    1.59  
    1.60        computer.HardwareAdded += new HardwareEventHandler(HardwareAdded);
    1.61        computer.HardwareRemoved += new HardwareEventHandler(HardwareRemoved);
    1.62 @@ -257,7 +244,7 @@
    1.63          plotMenuItem.Checked;
    1.64      }
    1.65  
    1.66 -    private void exitToolStripMenuItem_Click(object sender, EventArgs e) {
    1.67 +    private void exitClick(object sender, EventArgs e) {
    1.68        Close();      
    1.69      }
    1.70  
    1.71 @@ -265,7 +252,7 @@
    1.72        computer.Accept(updateVisitor);
    1.73        treeView.Invalidate();
    1.74        plotPanel.Invalidate();
    1.75 -      sensorSystemTray.Redraw();
    1.76 +      systemTray.Redraw();
    1.77      }
    1.78  
    1.79      private void SaveConfiguration() {
    1.80 @@ -299,8 +286,7 @@
    1.81        SaveConfiguration();
    1.82  
    1.83        timer.Enabled = false;
    1.84 -      sensorSystemTray.Dispose();
    1.85 -      notifyIcon.Dispose();
    1.86 +      systemTray.Dispose();      
    1.87        computer.Close();
    1.88      }
    1.89  
    1.90 @@ -347,16 +333,16 @@
    1.91              };
    1.92              sensorContextMenuStrip.Items.Add(item);
    1.93            }         
    1.94 -          if (sensorSystemTray.Contains(node.Sensor)) {
    1.95 +          if (systemTray.Contains(node.Sensor)) {
    1.96              ToolStripMenuItem item = new ToolStripMenuItem("Remove From Tray");
    1.97              item.Click += delegate(object obj, EventArgs args) {
    1.98 -              sensorSystemTray.Remove(node.Sensor);
    1.99 +              systemTray.Remove(node.Sensor);
   1.100              };
   1.101              sensorContextMenuStrip.Items.Add(item);
   1.102            } else {
   1.103              ToolStripMenuItem item = new ToolStripMenuItem("Add To Tray");
   1.104              item.Click += delegate(object obj, EventArgs args) {
   1.105 -              sensorSystemTray.Add(node.Sensor, true);
   1.106 +              systemTray.Add(node.Sensor, true);
   1.107              };
   1.108              sensorContextMenuStrip.Items.Add(item);
   1.109            }
   1.110 @@ -411,7 +397,7 @@
   1.111        if (sensor == null)
   1.112          return;
   1.113  
   1.114 -      sensorSystemTray.Remove(sensor);
   1.115 +      systemTray.Remove(sensor);
   1.116      }
   1.117  
   1.118      private void ShowParameterForm(ISensor sensor) {
   1.119 @@ -437,7 +423,7 @@
   1.120      }
   1.121  
   1.122      private void minTrayMenuItem_CheckedChanged(object sender, EventArgs e) {
   1.123 -      notifyIcon.Visible = minTrayMenuItem.Checked;
   1.124 +      systemTray.IsMainIconEnabled = minTrayMenuItem.Checked;
   1.125      }
   1.126  
   1.127      private void hiddenSensorsMenuItem_CheckedChanged(object sender,