Skip to content

Commit

Permalink
Fix issues with fan profile add/delete
Browse files Browse the repository at this point in the history 
- Update fan profile delete message to clarify which fan profiles will be deleted

Fixes #63
  • Loading branch information
@Sparronator9999
Sparronator9999 committed Feb 20, 2025
1 parent 8f3925b commit fdb2e72
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 81 deletions.
26 changes: 9 additions & 17 deletions YAMDCC.ConfigEditor/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
// YAMDCC. If not, see <https://www.gnu.org/licenses/>.

using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
Expand Down Expand Up @@ -814,14 +813,11 @@ private void ProfAdd(object sender, EventArgs e)
// Name it according to what the user specified
cfg.FanCurveConfs[cfg.CurveSel].Name = dlg.Result;
cfg.FanCurveConfs[cfg.CurveSel].Desc = $"(Copy of {oldCurveCfg.Name})\n{oldCurveCfg.Desc}";

// Add the new fan profile to the UI's profile list and select it:
if (i == cboFanSel.SelectedIndex)
{
cboProfSel.Items.Add(dlg.Result);
cboProfSel.SelectedIndex = cfg.CurveSel;
}
}

// Add the new fan profile to the UI's profile list and select it:
cboProfSel.Items.Add(dlg.Result);
cboProfSel.SelectedIndex = Config.FanConfs[cboFanSel.SelectedIndex].CurveSel;
}
}

Expand Down Expand Up @@ -868,21 +864,17 @@ private void ProfDel(object sender, EventArgs e)
Strings.GetString("dlgProfDel", curveCfg.Name),
$"Delete fan profile? ({cfg.Name})") == DialogResult.Yes)
{
// Remove each equivalent fan profile from the config's list
for (int i = 0; i < cboFanSel.Items.Count; i++)
{
cfg = Config.FanConfs[i];

// Remove the fan profile from the config's list
cfg.FanCurveConfs.RemoveAt(cfg.CurveSel);
cfg.CurveSel -= 1;

// Remove from the list client-side, and select a different fan profile
if (i == cboFanSel.SelectedIndex)
{
cboProfSel.Items.RemoveAt(cboProfSel.SelectedIndex);
cboProfSel.SelectedIndex = cfg.CurveSel;
}
}

// Remove from the list client-side, and select a different fan profile
cboProfSel.Items.RemoveAt(cboProfSel.SelectedIndex);
cboProfSel.SelectedIndex = Config.FanConfs[cboFanSel.SelectedIndex].CurveSel;
}
}

Expand Down
63 changes: 0 additions & 63 deletions YAMDCC.ConfigEditor/MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,6 @@
<metadata name="sep2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sep1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sep2.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sep4.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sep5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tsiLogLevel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sep3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="sep3.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
Expand All @@ -162,9 +144,6 @@
<metadata name="tsiCheckUpdate.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tsiCheckUpdate.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tcMain.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
Expand All @@ -186,33 +165,6 @@
<metadata name="tblExtra.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tblInfo.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tblExtra.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblFanMode.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblChgLim.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblPerfMode.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblWinFnSwap.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblKeyLight.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="flwKeyLight.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="flwChgLim.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblFanMode.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
Expand Down Expand Up @@ -252,21 +204,6 @@
<metadata name="lblFirmDate.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblModel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblManufacturer.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblAuthor.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblFirmVer.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="lblFirmDate.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="tblApply.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion YAMDCC.ConfigEditor/Strings.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<value>Please enter a new description for your fan profile:</value>
</data>
<data name="dlgProfDel" xml:space="preserve">
<value>This will delete the following fan profile:
<value>This will delete the following fan profile for ALL fans:
{0}
Are you sure you want to delete this profile?</value>
</data>
Expand Down

0 comments on commit fdb2e72

Please sign in to comment.