add IconKind tray menu item ("Show Percentage Icons" main menu item removed)

Author: sergiye

OpenHardwareMonitor/AssemblyInfo.cs

@@ -7,4 +7,4 @@
 [assembly: AssemblyCompany("HardwareMonitor")]
 [assembly: AssemblyProduct("OpenHardwareMonitor")]
 [assembly: AssemblyCopyright("Copyright © 2022 Sergiy Egoshyn")]
-[assembly: AssemblyVersion("2025.2.*")]
+[assembly: AssemblyVersion("3.0.*")]

OpenHardwareMonitor/UI/MainForm.Designer.cs

@@ -152,9 +152,6 @@ public MainForm()
         UserOption showHiddenSensors = new("hiddenMenuItem", false, hiddenMenuItem, _settings);
         showHiddenSensors.Changed += delegate { treeModel.ForceVisible = showHiddenSensors.Value; };
 
-        UserOption showPercentageIcons = new("showPercentageIcons", false, percentageIconsMenuItem, _settings);
-        showPercentageIcons.Changed += delegate { _systemTray.ShowPercentageIcons = showPercentageIcons.Value; };
-
         UserOption showValue = new("valueMenuItem", true, valueMenuItem, _settings);
         showValue.Changed += delegate { treeView.Columns[1].IsVisible = showValue.Value; };
 
@@ -415,44 +412,21 @@ public MainForm()
 
         _sensorValuesTimeWindow.Changed += (_, _) =>
         {
-            TimeSpan timeWindow = TimeSpan.Zero;
-            switch (_sensorValuesTimeWindow.Value)
+            TimeSpan timeWindow = _sensorValuesTimeWindow.Value switch
             {
-                case 0:
-                    timeWindow = new TimeSpan(0, 0, 30);
-                    break;
-                case 1:
-                    timeWindow = new TimeSpan(0, 1, 0);
-                    break;
-                case 2:
-                    timeWindow = new TimeSpan(0, 2, 0);
-                    break;
-                case 3:
-                    timeWindow = new TimeSpan(0, 5, 0);
-                    break;
-                case 4:
-                    timeWindow = new TimeSpan(0, 10, 0);
-                    break;
-                case 5:
-                    timeWindow = new TimeSpan(0, 30, 0);
-                    break;
-                case 6:
-                    timeWindow = new TimeSpan(1, 0, 0);
-                    break;
-                case 7:
-                    timeWindow = new TimeSpan(2, 0, 0);
-                    break;
-                case 8:
-                    timeWindow = new TimeSpan(6, 0, 0);
-                    break;
-                case 9:
-                    timeWindow = new TimeSpan(12, 0, 0);
-                    break;
-                case 10:
-                    timeWindow = new TimeSpan(24, 0, 0);
-                    break;
-            }
-
+                0 => new TimeSpan(0, 0, 30),
+                1 => new TimeSpan(0, 1, 0),
+                2 => new TimeSpan(0, 2, 0),
+                3 => new TimeSpan(0, 5, 0),
+                4 => new TimeSpan(0, 10, 0),
+                5 => new TimeSpan(0, 30, 0),
+                6 => new TimeSpan(1, 0, 0),
+                7 => new TimeSpan(2, 0, 0),
+                8 => new TimeSpan(6, 0, 0),
+                9 => new TimeSpan(12, 0, 0),
+                10 => new TimeSpan(24, 0, 0),
+                _ => TimeSpan.Zero,
+            };
             _computer.Accept(new SensorVisitor(delegate(ISensor s) { s.ValuesTimeWindow = timeWindow; }));
         };
 
@@ -467,6 +441,10 @@ public MainForm()
                 WindowState = FormWindowState.Minimized;
                 Show();
             }
+            else
+            {
+                Timer_Tick(null, EventArgs.Empty);
+            }
         }
         else
         {

OpenHardwareMonitor/UI/MainForm.cs

@@ -8,15 +8,29 @@ namespace OpenHardwareMonitor.UI;
 
 public class SensorNotifyIcon : IDisposable
 {
+    private enum IconKind
+    {
+        Regular,
+        Percent,
+        Pie,
+    }
+
     private readonly NotifyIconAdv _notifyIcon;
     private IconFactory _iconFactory;
+    private IconKind _iconKind;
 
     public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor, PersistentSettings settings)
     {
         Sensor = sensor;
         _notifyIcon = new NotifyIconAdv();
         _iconFactory = new IconFactory();
         _iconFactory.Color = settings.GetValue(new Identifier(sensor.Identifier, "traycolor").ToString(), _iconFactory.Color);
+        if (Enum.TryParse(settings.GetValue(new Identifier(sensor.Identifier, "iconKind").ToString(), IconKind.Regular.ToString()), out IconKind iconKind))
+            _iconKind = iconKind;
+        else
+        {
+            _iconKind = sensor.SensorType.ValueIsPercent() ? IconKind.Percent : IconKind.Regular;
+        }
 
         var contextMenuStrip = new ContextMenuStrip();
         contextMenuStrip.Renderer = new ThemedToolStripRenderer();
@@ -33,6 +47,27 @@ public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor, PersistentS
             sensorSystemTray.Remove(Sensor);
         };
         contextMenuStrip.Items.Add(removeItem);
+
+        if (sensor.SensorType.ValueIsPercent())
+        {
+            var iconKindItem = new ToolStripMenuItem("Icon Kind");
+            iconKindItem.DropDownItems.Add(new ToolStripMenuItem("Value", null, (_, _) => { SetIconKind(IconKind.Regular); }) { Checked = _iconKind == IconKind.Regular });
+            iconKindItem.DropDownItems.Add(new ToolStripMenuItem("Percent", null, (_, _) => { SetIconKind(IconKind.Percent); }) { Checked = _iconKind == IconKind.Percent });
+            iconKindItem.DropDownItems.Add(new ToolStripMenuItem("Pie", null, (_, _) => { SetIconKind(IconKind.Pie); }) { Checked = _iconKind == IconKind.Pie });
+            void SetIconKind(IconKind iconKind)
+            {
+                _iconKind = iconKind;
+                for (int i = 0; i < iconKindItem.DropDownItems.Count; i++)
+                {
+                    if (iconKindItem.DropDownItems[i] is not ToolStripMenuItem menuItem) continue;
+                    menuItem.Checked = (int)_iconKind == i;
+                }
+                settings.SetValue(new Identifier(sensor.Identifier, "iconKind").ToString(), (int)_iconKind);
+                Update();
+            }
+            contextMenuStrip.Items.Add(iconKindItem);
+        }
+
         var colorItem = new ToolStripMenuItem("Change Color...");
         colorItem.Click += delegate
         {
@@ -129,17 +164,20 @@ private static string GetThroughputValue(float byteCount, byte preferredSufNum =
         return new string(result.Take(3).ToArray());
     }
 
-    public void Update(bool showPercentageIcons)
+    public void Update()
     {
         Icon icon = _notifyIcon.Icon;
         switch (Sensor.SensorType)
         {
             case SensorType.Load:
             case SensorType.Control:
             case SensorType.Level:
-                _notifyIcon.Icon = showPercentageIcons
-                    ? _iconFactory.CreatePercentageIcon(Sensor.Value.GetValueOrDefault())
-                    : _iconFactory.CreateTransparentIcon(GetString());
+                _notifyIcon.Icon = _iconKind switch
+                {
+                    IconKind.Percent => _iconFactory.CreatePercentageIcon(Sensor.Value.GetValueOrDefault()),
+                    IconKind.Pie => _iconFactory.CreatePercentagePieIcon((byte)Sensor.Value.GetValueOrDefault()),
+                    _ => _iconFactory.CreateTransparentIcon(GetString()),
+                };
                 break;
             default:
                 _notifyIcon.Icon = _iconFactory.CreateTransparentIcon(GetString());

OpenHardwareMonitor/UI/SensorNotifyIcon.cs

@@ -14,8 +14,6 @@ public class SystemTray : IDisposable
     private bool _mainIconEnabled;
     private readonly NotifyIconAdv _mainIcon;
 
-    public bool ShowPercentageIcons { get; set; }
-
     public SystemTray(IComputer computer, PersistentSettings settings)
     {
         _settings = settings;
@@ -94,7 +92,7 @@ public void Dispose()
     public void Redraw()
     {
         foreach (SensorNotifyIcon icon in _sensorList)
-            icon.Update(ShowPercentageIcons);
+            icon.Update();
     }
 
     public bool Contains(ISensor sensor) => _sensorList.Any(icon => icon.Sensor == sensor);

OpenHardwareMonitor/UI/SystemTray.cs

@@ -31,6 +31,16 @@ public enum SensorType
     Humidity // %
 }
 
+public static class SensorTypeExtensions
+{
+    public static bool ValueIsPercent(this SensorType sensorType) =>
+        sensorType == SensorType.Load
+     || sensorType == SensorType.Control
+     || sensorType == SensorType.Level
+     || sensorType == SensorType.Humidity
+    ;
+}
+
 /// <summary>
 /// Stores the readed value and the time in which it was recorded.
 /// </summary>