diff --git a/app/GHelper.csproj b/app/GHelper.csproj index 9cd7a1c5..c632cdd7 100644 --- a/app/GHelper.csproj +++ b/app/GHelper.csproj @@ -16,7 +16,7 @@ AnyCPU False True - 0.69 + 0.70 diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs index 49363f73..da4fc66d 100644 --- a/app/Settings.Designer.cs +++ b/app/Settings.Designer.cs @@ -255,7 +255,7 @@ namespace GHelper // sliderBattery.Location = new Point(16, 70); sliderBattery.Max = 100; - sliderBattery.Min = 50; + sliderBattery.Min = 40; sliderBattery.Name = "sliderBattery"; sliderBattery.Size = new Size(772, 40); sliderBattery.TabIndex = 39; diff --git a/app/Settings.cs b/app/Settings.cs index fe615df5..4debd7da 100644 --- a/app/Settings.cs +++ b/app/Settings.cs @@ -953,10 +953,11 @@ namespace GHelper labelBattery.Text = battery; }); + string trayTip = "CPU" + cpuTemp + HardwareControl.cpuFan; + if (gpuTemp.Length > 0) trayTip += "\nGPU" + gpuTemp + HardwareControl.gpuFan; + if (battery.Length > 0) trayTip += "\n" + battery; - Program.trayIcon.Text = "CPU" + cpuTemp + HardwareControl.cpuFan + "\n" - + "GPU" + gpuTemp + HardwareControl.gpuFan + - ((battery.Length > 0) ? ("\n" + battery) : ""); + Program.trayIcon.Text = trayTip; } @@ -1432,8 +1433,12 @@ namespace GHelper GpuMode = AsusACPI.GPUModeStandard; UltimateUI(mux == 1); - - if (eco < 0) tableGPU.Visible = false; + + if (eco < 0) + { + tableGPU.Visible = false; + if (Program.acpi.DeviceGet(AsusACPI.GPU_Fan) < 0 ) panelGPU.Visible = false; + } }