Small bits of refactoring.
1.1 --- a/GUI/MainForm.cs Sat Oct 16 18:26:47 2010 +0000
1.2 +++ b/GUI/MainForm.cs Sun Oct 17 08:21:33 2010 +0000
1.3 @@ -44,7 +44,7 @@
1.4 using Aga.Controls.Tree;
1.5 using Aga.Controls.Tree.NodeControls;
1.6 using OpenHardwareMonitor.Hardware;
1.7 -using OpenHardwareMonitor.Wmi;
1.8 +using OpenHardwareMonitor.WMI;
1.9
1.10 namespace OpenHardwareMonitor.GUI {
1.11 public partial class MainForm : Form {
2.1 --- a/Hardware/HDD/HDD.cs Sat Oct 16 18:26:47 2010 +0000
2.2 +++ b/Hardware/HDD/HDD.cs Sun Oct 17 08:21:33 2010 +0000
2.3 @@ -77,7 +77,8 @@
2.4 this.drive = drive;
2.5 this.count = 0;
2.6 this.lifeID = lifeID;
2.7 - this.lifeSensor = new Sensor("HDD", 0, SensorType.Level, this, settings);
2.8 + this.lifeSensor = new Sensor("Remaining life", 0, SensorType.Level,
2.9 + this, settings);
2.10
2.11 Update();
2.12 }
2.13 @@ -136,7 +137,7 @@
2.14 attributes.Exists(attr => (int)attr.ID == (int)lifeID))
2.15 {
2.16 lifeSensor.Value = attributes
2.17 - .Find(attr => (int)attr.ID == (int)temperatureID)
2.18 + .Find(attr => (int)attr.ID == (int)lifeID)
2.19 .AttrValue;
2.20 }
2.21 } else {
3.1 --- a/Wmi/Hardware.cs Sat Oct 16 18:26:47 2010 +0000
3.2 +++ b/Wmi/Hardware.cs Sun Oct 17 08:21:33 2010 +0000
3.3 @@ -38,7 +38,7 @@
3.4 using System.Management.Instrumentation;
3.5 using OpenHardwareMonitor.Hardware;
3.6
3.7 -namespace OpenHardwareMonitor.Wmi {
3.8 +namespace OpenHardwareMonitor.WMI {
3.9 [InstrumentationClass(InstrumentationType.Instance)]
3.10 public class Hardware : IWmiObject {
3.11 #region WMI Exposed
4.1 --- a/Wmi/IWmiObject.cs Sat Oct 16 18:26:47 2010 +0000
4.2 +++ b/Wmi/IWmiObject.cs Sun Oct 17 08:21:33 2010 +0000
4.3 @@ -35,7 +35,7 @@
4.4
4.5 */
4.6
4.7 -namespace OpenHardwareMonitor.Wmi {
4.8 +namespace OpenHardwareMonitor.WMI {
4.9 interface IWmiObject {
4.10 // Both of these get exposed to WMI
4.11 string Name { get; }
5.1 --- a/Wmi/Sensor.cs Sat Oct 16 18:26:47 2010 +0000
5.2 +++ b/Wmi/Sensor.cs Sun Oct 17 08:21:33 2010 +0000
5.3 @@ -37,9 +37,8 @@
5.4
5.5 using System.Management.Instrumentation;
5.6 using OpenHardwareMonitor.Hardware;
5.7 -using OpenHardwareMonitor.Wmi;
5.8
5.9 -namespace OpenHardwareMonitor.Wmi {
5.10 +namespace OpenHardwareMonitor.WMI {
5.11 [InstrumentationClass(InstrumentationType.Instance)]
5.12 public class Sensor : IWmiObject {
5.13 private ISensor sensor;
6.1 --- a/Wmi/WmiProvider.cs Sat Oct 16 18:26:47 2010 +0000
6.2 +++ b/Wmi/WmiProvider.cs Sun Oct 17 08:21:33 2010 +0000
6.3 @@ -39,14 +39,13 @@
6.4 using System.Collections.Generic;
6.5 using System.Management.Instrumentation;
6.6 using OpenHardwareMonitor.Hardware;
6.7 -using OpenHardwareMonitor.Wmi;
6.8
6.9 [assembly: Instrumented("root/OpenHardwareMonitor")]
6.10
6.11 [System.ComponentModel.RunInstaller(true)]
6.12 public class InstanceInstaller : DefaultManagementProjectInstaller { }
6.13
6.14 -namespace OpenHardwareMonitor.Wmi {
6.15 +namespace OpenHardwareMonitor.WMI {
6.16 /// <summary>
6.17 /// The WMI Provider.
6.18 /// This class is not exposed to WMI itself.