diff -r 680ed54e05ca -r 9ad699538c89 GUI/SensorNotifyIcon.cs
--- a/GUI/SensorNotifyIcon.cs	Sat Jun 05 11:15:16 2010 +0000
+++ b/GUI/SensorNotifyIcon.cs	Sat Jun 05 18:59:54 2010 +0000
@@ -61,7 +61,7 @@
     private Pen pen;
     private Font font;
 
-    public SensorNotifyIcon(SensorSystemTray sensorSystemTray, ISensor sensor,
+    public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor,
       bool balloonTip) 
     {
       this.sensor = sensor;
@@ -78,7 +78,13 @@
       this.font = SystemFonts.MessageBoxFont;
 
       ContextMenuStrip contextMenuStrip = new ContextMenuStrip();
-      ToolStripMenuItem removeItem = new ToolStripMenuItem("Remove");
+      ToolStripMenuItem hideShowItem = new ToolStripMenuItem("Hide/Show");
+      hideShowItem.Click += delegate(object obj, EventArgs args) {
+        sensorSystemTray.SendHideShowCommand();
+      };
+      contextMenuStrip.Items.Add(hideShowItem);
+      contextMenuStrip.Items.Add(new ToolStripSeparator());
+      ToolStripMenuItem removeItem = new ToolStripMenuItem("Remove Sensor");
       removeItem.Click += delegate(object obj, EventArgs args) {
         sensorSystemTray.Remove(this.sensor);
       };
@@ -94,7 +100,16 @@
         }
       };
       contextMenuStrip.Items.Add(colorItem);
+      contextMenuStrip.Items.Add(new ToolStripSeparator());
+      ToolStripMenuItem exitItem = new ToolStripMenuItem("Exit");
+      exitItem.Click += delegate(object obj, EventArgs args) {
+        sensorSystemTray.SendExitCommand();
+      };
+      contextMenuStrip.Items.Add(exitItem);
       this.notifyIcon.ContextMenuStrip = contextMenuStrip;
+      this.notifyIcon.DoubleClick += delegate(object obj, EventArgs args) {
+        sensorSystemTray.SendHideShowCommand();
+      };
 
       this.bitmap = new Bitmap(16, 16, PixelFormat.Format32bppArgb);
       this.graphics = Graphics.FromImage(this.bitmap);