From 9f7da4c20a1802e593a61673fd870d7ff86b937e Mon Sep 17 00:00:00 2001 From: Serge <5920850+seerge@users.noreply.github.com> Date: Sun, 4 Jun 2023 23:20:37 +0200 Subject: [PATCH] GPU Section UI fixes --- app/HardwareControl.cs | 2 +- app/Settings.cs | 53 ++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/app/HardwareControl.cs b/app/HardwareControl.cs index aa0e2358..7875f994 100644 --- a/app/HardwareControl.cs +++ b/app/HardwareControl.cs @@ -31,7 +31,7 @@ public static class HardwareControl { AppConfig.setConfig("fan_max", fan); } - private static string FormatFan(int fan) + public static string FormatFan(int fan) { // fix for old models if (fan < 0) diff --git a/app/Settings.cs b/app/Settings.cs index f282e133..2e1834e4 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -34,6 +34,8 @@ namespace GHelper private bool customFans = false; private int customPower = 0; + bool isGpuSection = true; + public SettingsForm() { @@ -256,32 +258,36 @@ namespace GHelper contextMenuStrip.Items.Add("-"); - var titleGPU = new ToolStripMenuItem(Properties.Strings.GPUMode); - titleGPU.Margin = padding; - titleGPU.Enabled = false; - contextMenuStrip.Items.Add(titleGPU); + if (isGpuSection) + { + var titleGPU = new ToolStripMenuItem(Properties.Strings.GPUMode); + titleGPU.Margin = padding; + titleGPU.Enabled = false; + contextMenuStrip.Items.Add(titleGPU); - menuEco = new ToolStripMenuItem(Properties.Strings.EcoMode); - menuEco.Click += ButtonEco_Click; - menuEco.Margin = padding; - contextMenuStrip.Items.Add(menuEco); + menuEco = new ToolStripMenuItem(Properties.Strings.EcoMode); + menuEco.Click += ButtonEco_Click; + menuEco.Margin = padding; + contextMenuStrip.Items.Add(menuEco); - menuStandard = new ToolStripMenuItem(Properties.Strings.StandardMode); - menuStandard.Click += ButtonStandard_Click; - menuStandard.Margin = padding; - contextMenuStrip.Items.Add(menuStandard); + menuStandard = new ToolStripMenuItem(Properties.Strings.StandardMode); + menuStandard.Click += ButtonStandard_Click; + menuStandard.Margin = padding; + contextMenuStrip.Items.Add(menuStandard); - menuUltimate = new ToolStripMenuItem(Properties.Strings.UltimateMode); - menuUltimate.Click += ButtonUltimate_Click; - menuUltimate.Margin = padding; - contextMenuStrip.Items.Add(menuUltimate); + menuUltimate = new ToolStripMenuItem(Properties.Strings.UltimateMode); + menuUltimate.Click += ButtonUltimate_Click; + menuUltimate.Margin = padding; + contextMenuStrip.Items.Add(menuUltimate); - menuOptimized = new ToolStripMenuItem(Properties.Strings.Optimized); - menuOptimized.Click += ButtonOptimized_Click; - menuOptimized.Margin = padding; - contextMenuStrip.Items.Add(menuOptimized); + menuOptimized = new ToolStripMenuItem(Properties.Strings.Optimized); + menuOptimized.Click += ButtonOptimized_Click; + menuOptimized.Margin = padding; + contextMenuStrip.Items.Add(menuOptimized); + + contextMenuStrip.Items.Add("-"); + } - contextMenuStrip.Items.Add("-"); var quit = new ToolStripMenuItem(Properties.Strings.Quit); quit.Click += ButtonQuit_Click; @@ -1470,8 +1476,9 @@ namespace GHelper if (eco < 0) { - tableGPU.Visible = false; - if (Program.acpi.DeviceGet(AsusACPI.GPU_Fan) < -65536) panelGPU.Visible = false; + isGpuSection = tableGPU.Visible = false; + SetContextMenu(); + if (HardwareControl.FormatFan(Program.acpi.DeviceGet(AsusACPI.GPU_Fan)) is null) panelGPU.Visible = false; } }