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

UI tweaks

Browse Source
This commit is contained in:
Serge
2024-01-01 16:26:17 +01:00
parent aabead161a
commit 7bd0d3594a
6 changed files with 375 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
app/Settings.cs
View File

@@ -471,11 +471,8 @@ namespace GHelper
public void SetVersionLabel(string label, bool update = false)
{
Invoke(delegate
{
labelVersion.Text = label;
if (update) labelVersion.ForeColor = colorTurbo;
});
labelVersion.Text = label;
if (update) labelVersion.ForeColor = colorTurbo;
}
@@ -659,18 +656,12 @@ namespace GHelper
public void FansInit()
{
Invoke(delegate
{
if (fansForm != null && fansForm.Text != "") fansForm.InitAll();
});
if (fansForm != null && fansForm.Text != "") fansForm.InitAll();
}
public void GPUInit()
{
Invoke(delegate
{
if (fansForm != null && fansForm.Text != "") fansForm.InitGPU();
});
if (fansForm != null && fansForm.Text != "") fansForm.InitGPU();
}
public void FansToggle(int index = 0)
@@ -764,12 +755,9 @@ namespace GHelper
public void VisualiseAura()
{
Invoke(delegate
{
pictureColor.BackColor = Aura.Color1;
pictureColor2.BackColor = Aura.Color2;
pictureColor2.Visible = Aura.HasSecondColor();
});
pictureColor.BackColor = Aura.Color1;
pictureColor2.BackColor = Aura.Color2;
pictureColor2.Visible = Aura.HasSecondColor();
}
public void InitMatrix()
@@ -1001,18 +989,19 @@ namespace GHelper
if (gpuTemp.Length > 0) trayTip += "\nGPU" + gpuTemp + " " + HardwareControl.gpuFan;
if (battery.Length > 0) trayTip += "\n" + battery;
Program.settingsForm.BeginInvoke(delegate
{
labelCPUFan.Text = "CPU" + cpuTemp + " " + HardwareControl.cpuFan;
labelGPUFan.Text = "GPU" + gpuTemp + " " + HardwareControl.gpuFan;
if (HardwareControl.midFan is not null)
labelMidFan.Text = "Mid " + HardwareControl.midFan;
if (Program.settingsForm.IsHandleCreated)
Program.settingsForm.BeginInvoke(delegate
{
labelCPUFan.Text = "CPU" + cpuTemp + " " + HardwareControl.cpuFan;
labelGPUFan.Text = "GPU" + gpuTemp + " " + HardwareControl.gpuFan;
if (HardwareControl.midFan is not null)
labelMidFan.Text = "Mid " + HardwareControl.midFan;
labelBattery.Text = battery;
if (!batteryMouseOver && !batteryFullMouseOver) labelCharge.Text = charge;
labelBattery.Text = battery;
if (!batteryMouseOver && !batteryFullMouseOver) labelCharge.Text = charge;
//panelPerformance.AccessibleName = labelPerf.Text + " " + trayTip;
});
//panelPerformance.AccessibleName = labelPerf.Text + " " + trayTip;
});
Program.trayIcon.Text = trayTip;
@@ -1027,52 +1016,56 @@ namespace GHelper
public void ShowMode(int mode)
{
Invoke(delegate
buttonSilent.Activated = false;
buttonBalanced.Activated = false;
buttonTurbo.Activated = false;
buttonFans.Activated = false;
menuSilent.Checked = false;
menuBalanced.Checked = false;
menuTurbo.Checked = false;
switch (mode)
{
buttonSilent.Activated = false;
buttonBalanced.Activated = false;
buttonTurbo.Activated = false;
buttonFans.Activated = false;
menuSilent.Checked = false;
menuBalanced.Checked = false;
menuTurbo.Checked = false;
switch (mode)
{
case AsusACPI.PerformanceSilent:
buttonSilent.Activated = true;
menuSilent.Checked = true;
break;
case AsusACPI.PerformanceTurbo:
buttonTurbo.Activated = true;
menuTurbo.Checked = true;
break;
case AsusACPI.PerformanceBalanced:
buttonBalanced.Activated = true;
menuBalanced.Checked = true;
break;
default:
buttonFans.Activated = true;
buttonFans.BorderColor = Modes.GetBase(mode) switch
{
AsusACPI.PerformanceSilent => colorEco,
AsusACPI.PerformanceTurbo => colorTurbo,
_ => colorStandard,
};
break;
}
});
case AsusACPI.PerformanceSilent:
buttonSilent.Activated = true;
menuSilent.Checked = true;
break;
case AsusACPI.PerformanceTurbo:
buttonTurbo.Activated = true;
menuTurbo.Checked = true;
break;
case AsusACPI.PerformanceBalanced:
buttonBalanced.Activated = true;
menuBalanced.Checked = true;
break;
default:
buttonFans.Activated = true;
buttonFans.BorderColor = Modes.GetBase(mode) switch
{
AsusACPI.PerformanceSilent => colorEco,
AsusACPI.PerformanceTurbo => colorTurbo,
_ => colorStandard,
};
break;
}
}
public void SetModeLabel(string modeText)
{
Invoke(delegate
if (InvokeRequired)
{
Invoke(delegate {
labelPerf.Text = modeText;
panelPerformance.AccessibleName = labelPerf.Text;
});
} else
{
labelPerf.Text = modeText;
panelPerformance.AccessibleName = labelPerf.Text;
});
}
}