Tray sensor display default color is black and color can be changed now. Fixed CPU load reading for AMD CPUs and added additional misc device for AMD core temperature reading.
3 Version: MPL 1.1/GPL 2.0/LGPL 2.1
5 The contents of this file are subject to the Mozilla Public License Version
6 1.1 (the "License"); you may not use this file except in compliance with
7 the License. You may obtain a copy of the License at
9 http://www.mozilla.org/MPL/
11 Software distributed under the License is distributed on an "AS IS" basis,
12 WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
13 for the specific language governing rights and limitations under the License.
15 The Original Code is the Open Hardware Monitor code.
17 The Initial Developer of the Original Code is
18 Michael Möller <m.moeller@gmx.ch>.
19 Portions created by the Initial Developer are Copyright (C) 2009-2010
20 the Initial Developer. All Rights Reserved.
24 Alternatively, the contents of this file may be used under the terms of
25 either the GNU General Public License Version 2 or later (the "GPL"), or
26 the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
27 in which case the provisions of the GPL or the LGPL are applicable instead
28 of those above. If you wish to allow use of your version of this file only
29 under the terms of either the GPL or the LGPL, and not to allow others to
30 use your version of this file under the terms of the MPL, indicate your
31 decision by deleting the provisions above and replace them with the notice
32 and other provisions required by the GPL or the LGPL. If you do not delete
33 the provisions above, a recipient may use your version of this file under
34 the terms of any one of the MPL, the GPL or the LGPL.
39 using System.Collections.Generic;
42 using System.Windows.Forms;
43 using OpenHardwareMonitor.Hardware;
44 using OpenHardwareMonitor.Utilities;
46 namespace OpenHardwareMonitor.GUI {
47 public class SensorSystemTray : IDisposable {
48 private Computer computer;
49 private List<SensorNotifyIcon> list = new List<SensorNotifyIcon>();
51 public SensorSystemTray(Computer computer) {
52 this.computer = computer;
53 computer.HardwareAdded += new HardwareEventHandler(HardwareAdded);
54 computer.HardwareRemoved += new HardwareEventHandler(HardwareRemoved);
57 private void HardwareRemoved(IHardware hardware) {
58 hardware.SensorAdded -= new SensorEventHandler(SensorAdded);
59 hardware.SensorRemoved -= new SensorEventHandler(SensorRemoved);
60 foreach (ISensor sensor in hardware.Sensors)
61 SensorRemoved(sensor);
64 private void HardwareAdded(IHardware hardware) {
65 foreach (ISensor sensor in hardware.Sensors)
67 hardware.SensorAdded += new SensorEventHandler(SensorAdded);
68 hardware.SensorRemoved += new SensorEventHandler(SensorRemoved);
71 private void SensorAdded(ISensor sensor) {
72 if (Config.Get(sensor.Identifier + "/tray", false))
76 private void SensorRemoved(ISensor sensor) {
78 Remove(sensor, false);
81 public void Dispose() {
82 foreach (SensorNotifyIcon icon in list)
86 public void Redraw() {
87 foreach (SensorNotifyIcon icon in list)
91 public bool Contains(ISensor sensor) {
92 foreach (SensorNotifyIcon icon in list)
93 if (icon.Sensor == sensor)
98 public void Add(ISensor sensor, bool balloonTip) {
99 if (Contains(sensor)) {
102 list.Add(new SensorNotifyIcon(this, sensor, balloonTip));
103 Config.Set(sensor.Identifier + "/tray", true);
107 public void Remove(ISensor sensor) {
108 Remove(sensor, true);
111 private void Remove(ISensor sensor, bool deleteConfig) {
113 Config.Remove(sensor.Identifier + "/tray");
114 Config.Remove(sensor.Identifier + "/traycolor");
116 SensorNotifyIcon instance = null;
117 foreach (SensorNotifyIcon icon in list)
118 if (icon.Sensor == sensor)
120 if (instance != null) {
121 list.Remove(instance);