1.1 --- a/Hardware/Sensor.cs	Thu Aug 05 19:28:50 2010 +0000
     1.2 +++ b/Hardware/Sensor.cs	Sun Aug 08 13:57:26 2010 +0000
     1.3 @@ -37,11 +37,11 @@
     1.4  
     1.5  using System;
     1.6  using System.Collections.Generic;
     1.7 -using OpenHardwareMonitor.Utilities;
     1.8 +using OpenHardwareMonitor.Collections;
     1.9  
    1.10  namespace OpenHardwareMonitor.Hardware {
    1.11  
    1.12 -  public class Sensor : ISensor {
    1.13 +  internal class Sensor : ISensor {
    1.14  
    1.15      private string defaultName;
    1.16      private string name;
    1.17 @@ -55,6 +55,7 @@
    1.18      private float? max;
    1.19      private Queue<SensorValue> values =
    1.20        new Queue<SensorValue>(MAX_MINUTES * 15);
    1.21 +    private ISettings settings;
    1.22      
    1.23      private float sum = 0;
    1.24      private int count = 0;
    1.25 @@ -62,19 +63,19 @@
    1.26      private const int MAX_MINUTES = 120;
    1.27     
    1.28      public Sensor(string name, int index, SensorType sensorType,
    1.29 -      IHardware hardware) : this(name, index, sensorType, hardware, 
    1.30 -      null) { }
    1.31 +      IHardware hardware, ISettings settings) : 
    1.32 +      this(name, index, sensorType, hardware, null, settings) { }
    1.33  
    1.34      public Sensor(string name, int index, SensorType sensorType,
    1.35 -      IHardware hardware, ParameterDescription[] parameterDescriptions) :
    1.36 +      IHardware hardware, ParameterDescription[] parameterDescriptions, 
    1.37 +      ISettings settings) :
    1.38        this(name, index, false, sensorType, hardware,
    1.39 -        parameterDescriptions) { }
    1.40 +        parameterDescriptions, settings) { }
    1.41  
    1.42      public Sensor(string name, int index, bool defaultHidden, 
    1.43        SensorType sensorType, IHardware hardware, 
    1.44 -      ParameterDescription[] parameterDescriptions) 
    1.45 -    {
    1.46 -      this.defaultName = name;      
    1.47 +      ParameterDescription[] parameterDescriptions, ISettings settings) 
    1.48 +    {           
    1.49        this.index = index;
    1.50        this.defaultHidden = defaultHidden;
    1.51        this.sensorType = sensorType;
    1.52 @@ -82,15 +83,13 @@
    1.53        Parameter[] parameters = new Parameter[parameterDescriptions == null ?
    1.54          0 : parameterDescriptions.Length];
    1.55        for (int i = 0; i < parameters.Length; i++ ) 
    1.56 -        parameters[i] = new Parameter(parameterDescriptions[i], this);
    1.57 +        parameters[i] = new Parameter(parameterDescriptions[i], this, settings);
    1.58        this.parameters = parameters;
    1.59  
    1.60 -      string configName = Config.Settings[
    1.61 -        new Identifier(Identifier, "name").ToString()];
    1.62 -      if (configName != null)
    1.63 -        this.name = configName;
    1.64 -      else
    1.65 -        this.name = name;
    1.66 +      this.settings = settings;
    1.67 +      this.defaultName = name; 
    1.68 +      this.name = settings.Get(
    1.69 +        new Identifier(Identifier, "name").ToString(), name);
    1.70      }
    1.71  
    1.72      public IHardware Hardware {
    1.73 @@ -117,7 +116,7 @@
    1.74            name = value;          
    1.75          else 
    1.76            name = defaultName;
    1.77 -        Config.Settings[new Identifier(Identifier, "name").ToString()] = name;
    1.78 +        settings.Set(new Identifier(Identifier, "name").ToString(), name);
    1.79        }
    1.80      }
    1.81