icons show correctly now

2026-06-10 23:17:25 -05:00
parent e23feff44d
commit 8a17a5e799
7 changed files with 119 additions and 12 deletions
@@ -2,12 +2,20 @@
 // If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // Copyright (C) LibreHardwareMonitor and Contributors.

+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Storage.Streams;
 using LibreHardwareMonitor.Hardware;

 namespace LibreHardwareMonitor.Windows.WinUI.Utilities;

 public static class SensorTypeDisplay
 {
+    private static readonly Dictionary<string, BitmapImage> _imageCache = new();
+
    public static string GetText(SensorType sensorType)
    {
        return sensorType switch
@@ -86,4 +94,94 @@ public static class SensorTypeDisplay
            _ => "\uE950"
        };
    }
+
+    public static string GetImageFile(SensorType sensorType)
+    {
+        return sensorType switch
+        {
+            SensorType.Voltage => "voltage.png",
+            SensorType.Current => "current.png",
+            SensorType.Clock => "clock.png",
+            SensorType.Load => "load.png",
+            SensorType.Temperature => "temperature.png",
+            SensorType.Fan => "fan.png",
+            SensorType.Flow => "flow.png",
+            SensorType.Control => "control.png",
+            SensorType.Level => "level.png",
+            SensorType.Power => "power.png",
+            SensorType.Data => "data.png",
+            SensorType.SmallData => "data.png",
+            SensorType.Factor => "factor.png",
+            SensorType.Frequency => "clock.png",
+            SensorType.Throughput => "throughput.png",
+            SensorType.TimeSpan => "time.png",
+            SensorType.Timing => "time.png",
+            SensorType.Energy => "power.png",
+            SensorType.Noise => "loudspeaker.png",
+            SensorType.Conductivity => "voltage.png",
+            SensorType.Humidity => "humidity.png",
+            _ => "power.png"
+        };
+    }
+
+    public static string GetHardwareImageFile(HardwareType hardwareType)
+    {
+        return hardwareType switch
+        {
+            HardwareType.Motherboard => "mainboard.png",
+            HardwareType.SuperIO => "chip.png",
+            HardwareType.Cpu => "cpu.png",
+            HardwareType.Memory => "ram.png",
+            HardwareType.GpuNvidia => "nvidia.png",
+            HardwareType.GpuAmd => "amd.png",
+            HardwareType.GpuIntel => "intel.png",
+            HardwareType.Storage => "hdd.png",
+            HardwareType.Network => "nic.png",
+            HardwareType.Cooler => "fan.png",
+            HardwareType.EmbeddedController => "chip.png",
+            HardwareType.Psu => "power-supply.png",
+            HardwareType.Battery => "battery.png",
+            HardwareType.PowerMonitor => "powermonitor.png",
+            _ => "cpu.png"
+        };
+    }
+
+    public static ImageSource? GetImageByFilename(string? filename)
+    {
+        if (string.IsNullOrEmpty(filename))
+            return null;
+
+        if (_imageCache.TryGetValue(filename, out var cached))
+            return cached;
+
+        try
+        {
+            var assembly = typeof(SensorTypeDisplay).Assembly;
+            using var stream = assembly.GetManifestResourceStream("LibreHardwareMonitor.Windows.WinUI.Resources." + filename);
+            if (stream == null)
+                return null;
+
+            var bitmapImage = new BitmapImage();
+            var randomAccessStream = new InMemoryRandomAccessStream();
+            using (var writeStream = randomAccessStream.AsStreamForWrite())
+            {
+                stream.CopyTo(writeStream);
+                writeStream.Flush();
+                randomAccessStream.Seek(0);
+                bitmapImage.SetSource(randomAccessStream);
+            }
+
+            _imageCache[filename] = bitmapImage;
+            return bitmapImage;
+        }
+        catch (Exception ex)
+        {
+            try
+            {
+                File.WriteAllText(Path.Combine(AppContext.BaseDirectory, "icon_error.txt"), ex.ToString());
+            }
+            catch {}
+            return null;
+        }
+    }
 }