1.1 --- a/Hardware/Mainboard/Mainboard.cs Thu Aug 05 19:28:50 2010 +0000
1.2 +++ b/Hardware/Mainboard/Mainboard.cs Sun Aug 08 13:57:26 2010 +0000
1.3 @@ -37,21 +37,19 @@
1.4
1.5 using System;
1.6 using System.Collections.Generic;
1.7 -using System.Drawing;
1.8 using System.Text;
1.9 using OpenHardwareMonitor.Hardware.LPC;
1.10
1.11 namespace OpenHardwareMonitor.Hardware.Mainboard {
1.12 - public class Mainboard : IHardware {
1.13 + internal class Mainboard : IHardware {
1.14 private SMBIOS smbios;
1.15 private string name;
1.16 - private Image icon;
1.17
1.18 private LPCIO lpcio;
1.19 private LMSensors lmSensors;
1.20 private IHardware[] superIOHardware;
1.21
1.22 - public Mainboard() {
1.23 + public Mainboard(ISettings settings) {
1.24 this.smbios = new SMBIOS();
1.25
1.26 if (smbios.Board != null) {
1.27 @@ -69,7 +67,6 @@
1.28 this.name = Manufacturer.Unknown.ToString();
1.29 }
1.30
1.31 - this.icon = Utilities.EmbeddedResources.GetImage("mainboard.png");
1.32 ISuperIO[] superIO;
1.33 int p = (int)System.Environment.OSVersion.Platform;
1.34 if ((p == 4) || (p == 128)) {
1.35 @@ -84,8 +81,8 @@
1.36 for (int i = 0; i < superIO.Length; i++)
1.37 superIOHardware[i] = new SuperIOHardware(superIO[i],
1.38 smbios.Board != null ? smbios.Board.Manufacturer :
1.39 - Manufacturer.Unknown, smbios.Board != null ? smbios.Board.Model :
1.40 - Model.Unknown);
1.41 + Manufacturer.Unknown, smbios.Board != null ? smbios.Board.Model :
1.42 + Model.Unknown, settings);
1.43 }
1.44
1.45 public string Name {
1.46 @@ -96,8 +93,8 @@
1.47 get { return new Identifier("mainboard"); }
1.48 }
1.49
1.50 - public Image Icon {
1.51 - get { return icon; }
1.52 + public HardwareType HardwareType {
1.53 + get { return HardwareType.Mainboard; }
1.54 }
1.55
1.56 public string GetReport() {