show in tray (T) hotkey;

show in gadget (G) hotkey;
fixed 'Hide/show' sensor hotkey next node selection;
'Reset pen color' hotkey fix: next node selection disabled
removed auto-updates check in background

Author: sergiye

OpenHardwareMonitor/UI/MainForm.cs

@@ -103,7 +103,7 @@ public MainForm()
 
         treeModel.Nodes.Add(_root);
         treeView.Model = treeModel;
-        treeView.DrawControl += (sender, args) =>
+        treeView.DrawControl += (_, args) =>
         {
             // if (args.Node.IsSelected)
             //     return;
@@ -265,7 +265,7 @@ public MainForm()
                 Server.StopHttpListener();
         };
 
-        openWebServerMenuItem.Click += (s, e) => {
+        openWebServerMenuItem.Click += (_, _) => {
             System.Diagnostics.Process.Start("http://localhost:" + Server.ListenerPort);
         };
 
@@ -293,7 +293,7 @@ public MainForm()
                                               },
                                               _settings);
 
-        _loggingInterval.Changed += (sender, e) =>
+        _loggingInterval.Changed += (_, _) =>
         {
             switch (_loggingInterval.Value)
             {
@@ -352,7 +352,7 @@ public MainForm()
                                              },
                                              _settings);
 
-        _updateInterval.Changed += (sender, e) =>
+        _updateInterval.Changed += (_, _) =>
         {
             switch (_updateInterval.Value)
             {
@@ -378,7 +378,7 @@ public MainForm()
         };
 
         _throttleAtaUpdate = new UserOption("throttleAtaUpdateMenuItem", false, throttleAtaUpdateMenuItem, _settings);
-        _throttleAtaUpdate.Changed += (sender, e) =>
+        _throttleAtaUpdate.Changed += (_, _) =>
         {
             switch (_throttleAtaUpdate.Value)
             {
@@ -413,7 +413,7 @@ public MainForm()
         perSessionFileRotationMenuItem.Checked = _logger.FileRotationMethod == LoggerFileRotation.PerSession;
         dailyFileRotationMenuItem.Checked = _logger.FileRotationMethod == LoggerFileRotation.Daily;
 
-        _sensorValuesTimeWindow.Changed += (sender, e) =>
+        _sensorValuesTimeWindow.Changed += (_, _) =>
         {
             TimeSpan timeWindow = TimeSpan.Zero;
             switch (_sensorValuesTimeWindow.Value)
@@ -453,7 +453,7 @@ public MainForm()
                     break;
             }
 
-            _computer.Accept(new SensorVisitor(delegate(ISensor sensor) { sensor.ValuesTimeWindow = timeWindow; }));
+            _computer.Accept(new SensorVisitor(delegate(ISensor s) { s.ValuesTimeWindow = timeWindow; }));
         };
 
         InitializeTheme();
@@ -680,15 +680,6 @@ private void MainForm_Load(object sender, EventArgs e)
           Application.Exit
         );
 
-        //will display prompt only if update available & when main form displayed
-        var timer = new Timer();
-        timer.Interval = 3000;
-        timer.Tick += async (_, _) => {
-            timer.Enabled = false;
-            timer.Enabled = ! await Updater.CheckForUpdatesAsync(true);
-        };
-        timer.Enabled = true;
-
         FormClosed += MainForm_FormClosed;
     }
 
@@ -755,18 +746,35 @@ private void TreeView_KeyDown(object sender, KeyEventArgs e)
         var node = treeView.SelectedNode;
         if (node is not {Tag: SensorNode sensorNode} || sensorNode.Sensor == null)
             return;
-        switch (e.KeyCode) {
-            case Keys.H:
-                sensorNode.IsVisible = !sensorNode.IsVisible;
-                treeView.SelectedNode = node.NextNode;
-                break;
-            case Keys.P:
-                ShowParameterForm(sensorNode.Sensor);
-                break;
-            case Keys.R:
-                sensorNode.PenColor = null;
-                treeView.SelectedNode = node.NextNode;
-                break;
+        if (e.KeyCode == Keys.H)
+        {
+            treeView.SelectedNode = node.NextNode ?? node.PreviousNode;
+            sensorNode.IsVisible = !sensorNode.IsVisible;
+            e.SuppressKeyPress = true;
+            e.Handled = true;
+        }
+        else if (e.KeyCode == Keys.P)
+        {
+            ShowParameterForm(sensorNode.Sensor);
+        }
+        else if (e.KeyCode == Keys.R)
+        {
+            sensorNode.PenColor = null;
+            // treeView.SelectedNode = node.NextNode ?? node.PreviousNode;
+            e.SuppressKeyPress = true;
+            e.Handled = true;
+        }
+        else if (e.KeyCode == Keys.T && e.Control)
+        {
+            if (!_systemTray.Add(sensorNode.Sensor))
+                _systemTray.Remove(sensorNode.Sensor);
+            e.Handled = true;
+        }
+        else if (e.KeyCode == Keys.G && e.Control)
+        {
+            if (!_gadget.Add(sensorNode.Sensor))
+                _gadget.Remove(sensorNode.Sensor);
+            e.Handled = true;
         }
     }
 
@@ -829,21 +837,21 @@ private void TreeView_Click(object sender, EventArgs e)
                 treeContextMenu.Items.Add(item);
 
                 treeContextMenu.Items.Add(new ToolStripSeparator());
-                item = new ToolStripMenuItem("Show in Tray") { Checked = _systemTray.Contains(node.Sensor) };
+                item = new ToolStripMenuItem("Show in Tray (Ctrl+T)") { Checked = _systemTray.Contains(node.Sensor) };
                 item.Click += (s, _) =>
                 {
                     if (s is not ToolStripMenuItem menuItem)
                         return;
                     if (menuItem.Checked)
                         _systemTray.Remove(node.Sensor);
                     else
-                        _systemTray.Add(node.Sensor, true);
+                        _systemTray.Add(node.Sensor);
                 };
                 treeContextMenu.Items.Add(item);
 
                 if (_gadget != null)
                 {
-                    item = new ToolStripMenuItem("Show in Gadget") { Checked = _gadget.Contains(node.Sensor) };
+                    item = new ToolStripMenuItem("Show in Gadget (Ctrl+G)") { Checked = _gadget.Contains(node.Sensor) };
                     item.Click += (s, _) =>
                     {
                         if (s is not ToolStripMenuItem menuItem)

OpenHardwareMonitor/UI/SensorGadget.cs

@@ -347,11 +347,10 @@ public bool Contains(ISensor sensor)
         return _sensors.Values.Any(list => list.Contains(sensor));
     }
 
-    public void Add(ISensor sensor)
+    public bool Add(ISensor sensor)
     {
         if (Contains(sensor))
-            return;
-
+            return false;
 
         // get the right hardware
         IHardware hardware = sensor.Hardware;
@@ -374,6 +373,7 @@ public void Add(ISensor sensor)
 
         _settings.SetValue(new Identifier(sensor.Identifier, "gadget").ToString(), true);
         Resize();
+        return true;
     }
 
     public void Remove(ISensor sensor)

OpenHardwareMonitor/UI/SystemTray.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using OpenHardwareMonitor.Hardware;
 using OpenHardwareMonitor.Utilities;
@@ -74,7 +75,7 @@ private void HardwareAdded(IHardware hardware)
     private void SensorAdded(ISensor sensor)
     {
         if (_settings.GetValue(new Identifier(sensor.Identifier, "tray").ToString(), false))
-            Add(sensor, false);
+            Add(sensor);
     }
 
     private void SensorRemoved(ISensor sensor)
@@ -96,23 +97,17 @@ public void Redraw()
             icon.Update(ShowPercentageIcons);
     }
 
-    public bool Contains(ISensor sensor)
-    {
-        foreach (SensorNotifyIcon icon in _sensorList)
-            if (icon.Sensor == sensor)
-                return true;
-        return false;
-    }
+    public bool Contains(ISensor sensor) => _sensorList.Any(icon => icon.Sensor == sensor);
 
-    public void Add(ISensor sensor, bool balloonTip)
+    public bool Add(ISensor sensor)
     {
         if (Contains(sensor))
-            return;
-
+            return false;
 
         _sensorList.Add(new SensorNotifyIcon(this, sensor, _settings));
         UpdateMainIconVisibility();
         _settings.SetValue(new Identifier(sensor.Identifier, "tray").ToString(), true);
+        return true;
     }
 
     public void Remove(ISensor sensor)