mirror of
https://github.com/openhardwaremonitor/openhardwaremonitor
synced 2025-09-03 15:55:26 +00:00
Added a new icon for RAM hardware.
This commit is contained in:
@@ -4,7 +4,7 @@
|
|||||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
Copyright (C) 2010 Michael Möller <mmoeller@openhardwaremonitor.org>
|
Copyright (C) 2010-2012 Michael Möller <mmoeller@openhardwaremonitor.org>
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ namespace OpenHardwareMonitor.GUI {
|
|||||||
image = Utilities.EmbeddedResources.GetImage("bigng.png");
|
image = Utilities.EmbeddedResources.GetImage("bigng.png");
|
||||||
break;
|
break;
|
||||||
case HardwareType.RAM:
|
case HardwareType.RAM:
|
||||||
image = Utilities.EmbeddedResources.GetImage("chip.png");
|
image = Utilities.EmbeddedResources.GetImage("ram.png");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
image = new Bitmap(1, 1);
|
image = new Bitmap(1, 1);
|
||||||
|
@@ -183,6 +183,10 @@ namespace OpenHardwareMonitor.Hardware {
|
|||||||
r.AppendLine(MemoryDevices[i].ManufacturerName);
|
r.AppendLine(MemoryDevices[i].ManufacturerName);
|
||||||
r.Append("Memory Device [" + i + "] Part Number: ");
|
r.Append("Memory Device [" + i + "] Part Number: ");
|
||||||
r.AppendLine(MemoryDevices[i].PartNumber);
|
r.AppendLine(MemoryDevices[i].PartNumber);
|
||||||
|
r.Append("Memory Device [" + i + "] Device Locator: ");
|
||||||
|
r.AppendLine(MemoryDevices[i].DeviceLocator);
|
||||||
|
r.Append("Memory Device [" + i + "] Bank Locator: ");
|
||||||
|
r.AppendLine(MemoryDevices[i].BankLocator);
|
||||||
r.AppendLine();
|
r.AppendLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -357,32 +361,35 @@ namespace OpenHardwareMonitor.Hardware {
|
|||||||
|
|
||||||
public class MemoryDevice : Structure {
|
public class MemoryDevice : Structure {
|
||||||
|
|
||||||
|
private readonly string deviceLocator;
|
||||||
|
private readonly string bankLocator;
|
||||||
private readonly string manufacturerName;
|
private readonly string manufacturerName;
|
||||||
private readonly string serialNumber;
|
private readonly string serialNumber;
|
||||||
private readonly string partNumber;
|
private readonly string partNumber;
|
||||||
|
|
||||||
public MemoryDevice(string manufacturerName, string serialNumber,
|
|
||||||
string partNumber)
|
|
||||||
: base(0x11, 0, null, null) {
|
|
||||||
this.manufacturerName = manufacturerName;
|
|
||||||
this.serialNumber = serialNumber;
|
|
||||||
this.partNumber = partNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MemoryDevice(byte type, ushort handle, byte[] data,
|
public MemoryDevice(byte type, ushort handle, byte[] data,
|
||||||
string[] strings)
|
string[] strings)
|
||||||
: base(type, handle, data, strings) {
|
: base(type, handle, data, strings)
|
||||||
|
{
|
||||||
|
this.deviceLocator = GetString(0x10).Trim();
|
||||||
|
this.bankLocator = GetString(0x11).Trim();
|
||||||
this.manufacturerName = GetString(0x17).Trim();
|
this.manufacturerName = GetString(0x17).Trim();
|
||||||
this.serialNumber = GetString(0x18).Trim();
|
this.serialNumber = GetString(0x18).Trim();
|
||||||
this.partNumber = GetString(0x1A).Trim();
|
this.partNumber = GetString(0x1A).Trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string DeviceLocator { get { return deviceLocator; } }
|
||||||
|
|
||||||
|
public string BankLocator { get { return bankLocator; } }
|
||||||
|
|
||||||
public string ManufacturerName { get { return manufacturerName; } }
|
public string ManufacturerName { get { return manufacturerName; } }
|
||||||
|
|
||||||
public string SerialNumber { get { return serialNumber; } }
|
public string SerialNumber { get { return serialNumber; } }
|
||||||
|
|
||||||
public string PartNumber { get { return partNumber; } }
|
public string PartNumber { get { return partNumber; } }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -284,6 +284,9 @@
|
|||||||
<EmbeddedResource Include="Resources\Web\js\knockout-2.1.0.min.js" />
|
<EmbeddedResource Include="Resources\Web\js\knockout-2.1.0.min.js" />
|
||||||
<EmbeddedResource Include="Resources\Web\js\knockout.mapping-latest.min.js" />
|
<EmbeddedResource Include="Resources\Web\js\knockout.mapping-latest.min.js" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<EmbeddedResource Include="Resources\ram.png" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<VisualStudio AllowExistingFolder="true" />
|
<VisualStudio AllowExistingFolder="true" />
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 852 B After Width: | Height: | Size: 806 B |
BIN
Resources/ram.png
Normal file
BIN
Resources/ram.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 768 B |
@@ -316,7 +316,7 @@ namespace OpenHardwareMonitor.Utilities
|
|||||||
case HardwareType.TBalancer:
|
case HardwareType.TBalancer:
|
||||||
return "bigng.png";
|
return "bigng.png";
|
||||||
case HardwareType.RAM:
|
case HardwareType.RAM:
|
||||||
return "chip.png";
|
return "ram.png";
|
||||||
default:
|
default:
|
||||||
return "cpu.png";
|
return "cpu.png";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user