jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Battery health is now a tooltip similarly to the other tooltips. Is only refreshed once every 15 Minutes at most, and only if the user hovers over the battery panel.

Browse Source
This commit is contained in:
IceStormNG
2023-07-20 16:32:42 +02:00
parent 584bd155d6
commit fc53159a51
3 changed files with 81 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app/Settings.cs
View File

@@ -9,6 +9,7 @@ using GHelper.Mode;
using GHelper.UI;
using System.Diagnostics;
using System.Timers;
using System.Windows.Forms;
namespace GHelper
{
@@ -32,6 +33,7 @@ namespace GHelper
public Updates? updates;
static long lastRefresh;
static long lastBatteryRefresh;
bool isGpuSection = true;
@@ -173,6 +175,15 @@ namespace GHelper
sensorTimer.Elapsed += OnTimedEvent;
sensorTimer.Enabled = true;
panelBattery.MouseEnter += PanelBattery_MouseEnter;
labelBatteryTitle.MouseEnter += PanelBattery_MouseEnter;
labelBatteryHealth.MouseEnter += PanelBattery_MouseEnter;
labelBattery.MouseEnter += PanelBattery_MouseEnter;
pictureBattery.MouseEnter += PanelBattery_MouseEnter;
sliderBattery.MouseEnter += PanelBattery_MouseEnter;
panelBattery.MouseLeave += PanelBattery_MouseLeave;
labelBatteryHealth.Text = String.Empty;
labelModel.Text = AppConfig.GetModelShort() + (ProcessHelper.IsUserAdministrator() ? "." : "");
TopMost = AppConfig.Is("topmost");
@@ -180,6 +191,51 @@ namespace GHelper
}
private void PanelBattery_MouseEnter(object? sender, EventArgs e)
{
ShowBatteryWear();
}
private void PanelBattery_MouseLeave(object? sender, EventArgs e)
{
labelBatteryHealth.Text = String.Empty;
}
private void PanelBattery_MouseMove(object? sender, MouseEventArgs e)
{
ShowBatteryWear();
}
private void ShowBatteryWear()
{
if (labelBatteryHealth.Text != String.Empty)
{
//Already visible. Nothing to do here.
return;
}
//Refresh again only after 15 Minutes since the last refresh
if (lastBatteryRefresh == 0 || Math.Abs(DateTimeOffset.Now.ToUnixTimeMilliseconds() - lastBatteryRefresh) > 15 * 60_000)
{
lastBatteryRefresh = DateTimeOffset.Now.ToUnixTimeMilliseconds();
HardwareControl.RefreshBatteryHealth();
}
string batteryHealth = "";
if (HardwareControl.batteryHealth == -1)
{
batteryHealth = Properties.Strings.BatteryHealth + ": " + "?";
}
else
{
batteryHealth = Properties.Strings.BatteryHealth + ": "
+ Math.Round((decimal)HardwareControl.batteryHealth, 1).ToString() + "%";
}
labelBatteryHealth.Text = batteryHealth;
}
private void SettingsForm_VisibleChanged(object? sender, EventArgs e)
{
sensorTimer.Enabled = this.Visible;
@@ -762,7 +818,6 @@ namespace GHelper
string cpuTemp = "";
string gpuTemp = "";
string battery = "";
string batteryHealth = "";
HardwareControl.ReadSensors();
@@ -775,15 +830,6 @@ namespace GHelper
battery = Properties.Strings.Charging + ": " + Math.Round((decimal)HardwareControl.batteryRate, 1).ToString() + "W";
if (HardwareControl.batteryWear == -1)
{
batteryHealth = Properties.Strings.BatteryHealth + ": " + "?";
}
else
{
batteryHealth = Properties.Strings.BatteryHealth + ": "
+ Math.Round((decimal)HardwareControl.batteryWear, 1).ToString() + "%";
}
if (HardwareControl.gpuTemp > 0)
{
@@ -799,7 +845,6 @@ namespace GHelper
labelMidFan.Text = "Mid" + HardwareControl.midFan;
labelBattery.Text = battery;
labelBatteryHealth.Text = batteryHealth;
});
string trayTip = "CPU" + cpuTemp + " " + HardwareControl.cpuFan;