Merge pull request #4 from Darren80/Dev

tweaks.
This commit is contained in:
Darren Ohonba - Evans
2024-05-24 00:34:39 +01:00
committed by GitHub
2 changed files with 7 additions and 1 deletions

View File

@@ -372,7 +372,7 @@
// //
this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1; this.notifyIcon1.ContextMenuStrip = this.contextMenuStrip1;
this.notifyIcon1.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon1.Icon"))); this.notifyIcon1.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon1.Icon")));
this.notifyIcon1.Text = "Hello"; this.notifyIcon1.Text = "AsusFanControlEnhanced";
this.notifyIcon1.Visible = true; this.notifyIcon1.Visible = true;
this.notifyIcon1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon1_MouseClick); this.notifyIcon1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon1_MouseClick);
// //

View File

@@ -150,6 +150,7 @@ namespace AsusFanControlGUI
Properties.Settings.Default.fanControlState = "Off"; Properties.Settings.Default.fanControlState = "Off";
Properties.Settings.Default.Save(); Properties.Settings.Default.Save();
notifyIcon1.Text = $"AsusFanControlEnhanced - Off";
setFanSpeed(0, null); setFanSpeed(0, null);
} }
} }
@@ -213,6 +214,9 @@ namespace AsusFanControlGUI
label5.Text = trackBarFanSpeedValue.ToString() + "% Fan"; label5.Text = trackBarFanSpeedValue.ToString() + "% Fan";
Console.WriteLine($"Setting speed to: {(int)trackBarFanSpeedValue}"); Console.WriteLine($"Setting speed to: {(int)trackBarFanSpeedValue}");
label3.Text = $"Setting speed to: {(int)trackBarFanSpeedValue}%";// (Stamp: {rnd.Next(1000)})"; label3.Text = $"Setting speed to: {(int)trackBarFanSpeedValue}%";// (Stamp: {rnd.Next(1000)})";
notifyIcon1.Text = $"AsusFanControlEnhanced - Fan Speed: {(int)trackBarFanSpeedValue}%";
if ((int)trackBarFanSpeedValue == 0)
notifyIcon1.Text = $"AsusFanControlEnhanced - Off";
setFanSpeed((int)trackBarFanSpeedValue, fanControl.Checked); setFanSpeed((int)trackBarFanSpeedValue, fanControl.Checked);
} }
@@ -502,6 +506,7 @@ namespace AsusFanControlGUI
// Temperature is outside the range, yield control to the system. // Temperature is outside the range, yield control to the system.
label3.Text = "Control yeilded to system when temprature is outside range."; label3.Text = "Control yeilded to system when temprature is outside range.";
Console.WriteLine("Temperature is outside the range, yield control to the system."); Console.WriteLine("Temperature is outside the range, yield control to the system.");
notifyIcon1.Text = $"AsusFanControlEnhanced - Off";
return 0; return 0;
}else }else
{ {
@@ -539,6 +544,7 @@ namespace AsusFanControlGUI
if (fanSpeed != 0) if (fanSpeed != 0)
{ {
label3.Text = $"Set fan speed to {(int)fanSpeed}%, current temp: {currentTemp}°C";// (Stamp: {rnd.Next(1000)})"; label3.Text = $"Set fan speed to {(int)fanSpeed}%, current temp: {currentTemp}°C";// (Stamp: {rnd.Next(1000)})";
notifyIcon1.Text = $"AsusFanControlEnhanced - Current Temp: {(int)currentTemp}°C - Fan Speed: {(int)fanSpeed}%";
} }
lastTemperature = (int)currentTemp; lastTemperature = (int)currentTemp;