Skip to content

Commit b03bc37

Browse files
sergiyesergiye
committed
remove temperature unit menu -> get from current RegionInfo
1 parent a2606aa commit b03bc37

File tree

8 files changed

+17
-109
lines changed

8 files changed

+17
-109
lines changed

‎OpenHardwareMonitor/UI/HardwareNode.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using OpenHardwareMonitor.Hardware;
2-
using OpenHardwareMonitor.Utilities;
32
using System;
43
using System.Collections.Generic;
54
using System.Text;
@@ -9,15 +8,13 @@ namespace OpenHardwareMonitor.UI;
98
public class HardwareNode : Node, IExpandPersistNode
109
{
1110
private readonly PersistentSettings _settings;
12-
private readonly UnitManager _unitManager;
1311
private readonly List<TypeNode> _typeNodes = new List<TypeNode>();
1412
private readonly string _expandedIdentifier;
1513
private bool _expanded;
1614

17-
public HardwareNode(IHardware hardware, PersistentSettings settings, UnitManager unitManager)
15+
public HardwareNode(IHardware hardware, PersistentSettings settings)
1816
{
1917
_settings = settings;
20-
_unitManager = unitManager;
2118
_expandedIdentifier = new Identifier(hardware.Identifier, "expanded").ToString();
2219
Hardware = hardware;
2320
Image = HardwareTypeImage.Instance.GetImage(hardware.HardwareType);
@@ -122,7 +119,7 @@ private void InsertSorted(Node node, ISensor sensor)
122119
while (i < node.Nodes.Count && ((SensorNode)node.Nodes[i]).Sensor.Index < sensor.Index)
123120
i++;
124121

125-
SensorNode sensorNode = new SensorNode(sensor, _settings, _unitManager);
122+
SensorNode sensorNode = new SensorNode(sensor, _settings);
126123
node.Nodes.Insert(i, sensorNode);
127124
}
128125

‎OpenHardwareMonitor/UI/MainForm.Designer.cs‎

Lines changed: 0 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenHardwareMonitor/UI/MainForm.cs‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public sealed partial class MainForm : Form
4343
private readonly UserOption _showGadget;
4444
private readonly StartupManager _startupManager = new();
4545
private readonly SystemTray _systemTray;
46-
private readonly UnitManager _unitManager;
4746
private readonly UpdateVisitor _updateVisitor = new();
4847
private readonly WmiProvider _wmiProvider;
4948

@@ -68,8 +67,6 @@ public MainForm()
6867
portableModeMenuItem.Checked = _settings.IsPortable;
6968
resetOnPowerChangedMenuItem.Checked = _settings.GetValue("resetOnPowerChangedMenuItem", false);
7069

71-
_unitManager = new UnitManager(_settings);
72-
7370
// make sure the buffers used for double buffering are not disposed
7471
// after each draw call
7572
BufferedGraphicsManager.Current.MaximumBuffer = Screen.PrimaryScreen.Bounds.Size;
@@ -116,7 +113,7 @@ public MainForm()
116113

117114
_computer = new Computer(_settings);
118115

119-
_systemTray = new SystemTray(_computer, _settings, _unitManager);
116+
_systemTray = new SystemTray(_computer, _settings);
120117
_systemTray.HideShowCommand += HideShowClick;
121118
_systemTray.ExitCommand += ExitClick;
122119

@@ -134,7 +131,7 @@ public MainForm()
134131
{
135132
// Windows
136133
treeView.RowHeight = Math.Max(treeView.Font.Height + 1, 18);
137-
_gadget = new SensorGadget(_computer, _settings, _unitManager);
134+
_gadget = new SensorGadget(_computer, _settings);
138135
_gadget.HideShowCommand += HideShowClick;
139136
_wmiProvider = new WmiProvider(_computer);
140137
}
@@ -246,9 +243,6 @@ public MainForm()
246243
_gadget.Visible = _showGadget.Value;
247244
};
248245

249-
celsiusMenuItem.Checked = _unitManager.TemperatureUnit == TemperatureUnit.Celsius;
250-
fahrenheitMenuItem.Checked = !celsiusMenuItem.Checked;
251-
252246
Server = new HttpServer(_root,
253247
_settings.GetValue("listenerIp", "?"),
254248
_settings.GetValue("listenerPort", 8085),
@@ -570,7 +564,7 @@ private void InsertSorted(IList<Node> nodes, HardwareNode node)
570564

571565
private void SubHardwareAdded(IHardware hardware, Node node)
572566
{
573-
HardwareNode hardwareNode = new(hardware, _settings, _unitManager);
567+
HardwareNode hardwareNode = new(hardware, _settings);
574568
InsertSorted(node.Nodes, hardwareNode);
575569
foreach (IHardware subHardware in hardware.SubHardware)
576570
SubHardwareAdded(subHardware, hardwareNode);
@@ -974,20 +968,6 @@ private void TreeView_NodeMouseDoubleClick(object sender, TreeNodeAdvMouseEventA
974968
ShowParameterForm(node.Sensor);
975969
}
976970

977-
private void CelsiusMenuItem_Click(object sender, EventArgs e)
978-
{
979-
celsiusMenuItem.Checked = true;
980-
fahrenheitMenuItem.Checked = false;
981-
_unitManager.TemperatureUnit = TemperatureUnit.Celsius;
982-
}
983-
984-
private void FahrenheitMenuItem_Click(object sender, EventArgs e)
985-
{
986-
celsiusMenuItem.Checked = false;
987-
fahrenheitMenuItem.Checked = true;
988-
_unitManager.TemperatureUnit = TemperatureUnit.Fahrenheit;
989-
}
990-
991971
private void ResetMinMaxMenuItem_Click(object sender, EventArgs e)
992972
{
993973
_computer.Accept(new SensorVisitor(delegate(ISensor sensorClick)

‎OpenHardwareMonitor/UI/SensorGadget.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class SensorGadget : Gadget
1717
private const int LeftBorder = 6;
1818
private const int RightBorder = 7;
1919

20-
private readonly UnitManager _unitManager;
2120
private Image _back = EmbeddedResources.GetImage("gadget.png");
2221
private Image _image;
2322
private Image _fore;
@@ -46,9 +45,8 @@ public class SensorGadget : Gadget
4645
private StringFormat _trimStringFormat;
4746
private StringFormat _alignRightStringFormat;
4847

49-
public SensorGadget(IComputer computer, PersistentSettings settings, UnitManager unitManager)
48+
public SensorGadget(IComputer computer, PersistentSettings settings)
5049
{
51-
_unitManager = unitManager;
5250
_settings = settings;
5351
computer.HardwareAdded += HardwareAdded;
5452
computer.HardwareRemoved += HardwareRemoved;
@@ -655,7 +653,7 @@ protected override void OnPaint(PaintEventArgs e)
655653
break;
656654
}
657655

658-
if (sensor.SensorType == SensorType.Temperature && _unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit)
656+
if (sensor.SensorType == SensorType.Temperature && UnitManager.IsFahrenheitUsed)
659657
{
660658
formatted = $"{UnitManager.CelsiusToFahrenheit(sensor.Value):F1} °F";
661659
}

‎OpenHardwareMonitor/UI/SensorNode.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,18 @@
33
using System.Globalization;
44
using System.Text;
55
using OpenHardwareMonitor.Hardware;
6-
using OpenHardwareMonitor.Utilities;
76

87
namespace OpenHardwareMonitor.UI;
98

109
public class SensorNode : Node
1110
{
1211
private readonly PersistentSettings _settings;
13-
private readonly UnitManager _unitManager;
1412
private Color? _penColor;
1513

16-
public SensorNode(ISensor sensor, PersistentSettings settings, UnitManager unitManager)
14+
public SensorNode(ISensor sensor, PersistentSettings settings)
1715
{
1816
Sensor = sensor;
1917
_settings = settings;
20-
_unitManager = unitManager;
2118

2219
switch (sensor.SensorType)
2320
{
@@ -166,7 +163,7 @@ public string ValueToString(float? value)
166163
{
167164
switch (Sensor.SensorType)
168165
{
169-
case SensorType.Temperature when _unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit:
166+
case SensorType.Temperature when UnitManager.IsFahrenheitUsed:
170167
{
171168
return $"{value * 1.8 + 32:F1} °F";
172169
}

‎OpenHardwareMonitor/UI/SensorNotifyIcon.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ namespace OpenHardwareMonitor.UI;
1313

1414
public class SensorNotifyIcon : IDisposable
1515
{
16-
private readonly UnitManager _unitManager;
1716
private readonly NotifyIconAdv _notifyIcon;
1817
private readonly Bitmap _bitmap;
1918
private readonly Graphics _graphics;
@@ -25,9 +24,8 @@ public class SensorNotifyIcon : IDisposable
2524
private readonly Font _font;
2625
private readonly Font _smallFont;
2726

28-
public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor, PersistentSettings settings, UnitManager unitManager)
27+
public SensorNotifyIcon(SystemTray sensorSystemTray, ISensor sensor, PersistentSettings settings)
2928
{
30-
_unitManager = unitManager;
3129
Sensor = sensor;
3230
_notifyIcon = new NotifyIconAdv();
3331

@@ -154,7 +152,7 @@ private string GetString()
154152
switch (Sensor.SensorType)
155153
{
156154
case SensorType.Temperature:
157-
return _unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit ? $"{UnitManager.CelsiusToFahrenheit(Sensor.Value):F0}" : $"{Sensor.Value:F0}";
155+
return UnitManager.IsFahrenheitUsed ? $"{UnitManager.CelsiusToFahrenheit(Sensor.Value):F0}" : $"{Sensor.Value:F0}";
158156
case SensorType.TimeSpan:
159157
return $"{TimeSpan.FromSeconds(Sensor.Value.Value):g}";
160158
case SensorType.Clock:
@@ -353,7 +351,7 @@ public void Update(bool showPercentageIcons)
353351

354352
string formattedValue = string.Format(format, Sensor.Name, Sensor.Value);
355353

356-
if (Sensor.SensorType == SensorType.Temperature && _unitManager.TemperatureUnit == TemperatureUnit.Fahrenheit)
354+
if (Sensor.SensorType == SensorType.Temperature && UnitManager.IsFahrenheitUsed)
357355
{
358356
format = "\n{0}: {1:F1} °F";
359357
formattedValue = string.Format(format, Sensor.Name, UnitManager.CelsiusToFahrenheit(Sensor.Value));

‎OpenHardwareMonitor/UI/SystemTray.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,16 @@ namespace OpenHardwareMonitor.UI;
88

99
public class SystemTray : IDisposable
1010
{
11-
private IComputer _computer;
1211
private readonly PersistentSettings _settings;
13-
private readonly UnitManager _unitManager;
1412
private readonly List<SensorNotifyIcon> _sensorList = new List<SensorNotifyIcon>();
1513
private bool _mainIconEnabled;
1614
private readonly NotifyIconAdv _mainIcon;
1715

1816
public bool ShowPercentageIcons { get; set; }
1917

20-
public SystemTray(IComputer computer, PersistentSettings settings, UnitManager unitManager)
18+
public SystemTray(IComputer computer, PersistentSettings settings)
2119
{
22-
_computer = computer;
2320
_settings = settings;
24-
_unitManager = unitManager;
2521
computer.HardwareAdded += HardwareAdded;
2622
computer.HardwareRemoved += HardwareRemoved;
2723

@@ -114,7 +110,7 @@ public void Add(ISensor sensor, bool balloonTip)
114110
return;
115111

116112

117-
_sensorList.Add(new SensorNotifyIcon(this, sensor, _settings, _unitManager));
113+
_sensorList.Add(new SensorNotifyIcon(this, sensor, _settings));
118114
UpdateMainIconVisibility();
119115
_settings.SetValue(new Identifier(sensor.Identifier, "tray").ToString(), true);
120116
}

‎OpenHardwareMonitor/UI/UnitManager.cs‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,8 @@
1-
using OpenHardwareMonitor.Utilities;
1+
namespace OpenHardwareMonitor.UI;
22

3-
namespace OpenHardwareMonitor.UI;
4-
5-
public enum TemperatureUnit
6-
{
7-
Celsius = 0,
8-
Fahrenheit = 1
9-
}
10-
11-
public class UnitManager
3+
public static class UnitManager
124
{
13-
14-
private readonly PersistentSettings _settings;
15-
private TemperatureUnit _temperatureUnit;
16-
17-
public UnitManager(PersistentSettings settings)
18-
{
19-
_settings = settings;
20-
_temperatureUnit = (TemperatureUnit)settings.GetValue("TemperatureUnit", (int)TemperatureUnit.Celsius);
21-
}
22-
23-
public TemperatureUnit TemperatureUnit
24-
{
25-
get { return _temperatureUnit; }
26-
set
27-
{
28-
_temperatureUnit = value;
29-
_settings.SetValue("TemperatureUnit", (int)_temperatureUnit);
30-
}
31-
}
5+
public static bool IsFahrenheitUsed => !OperatingSystemHelper.IsMetricSystemUsed;
326

337
public static float? CelsiusToFahrenheit(float? valueInCelsius)
348
{

0 commit comments

Comments
 (0)