Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to .NET Framework Settings System #114

Merged
merged 22 commits into from
Feb 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1658356
Inventory of reg keys and program variables
gbakeman Oct 5, 2023
41d3aa3
Initial work on Prefs upgrading dialog
gbakeman Oct 5, 2023
214a632
Tweaking how paths are handled
gbakeman Oct 8, 2023
79fa3f8
Initial creation of application settings files
gbakeman Oct 20, 2023
0dd0a90
Merge branch 'Dev-2.2' into 100-new-settings
gbakeman Oct 20, 2023
04a4a30
Small project config changes
gbakeman Oct 20, 2023
9b670fc
Upgrade DNF, remove extraneous settings
gbakeman Oct 22, 2023
1380e98
Settings tweak, new string resources
gbakeman Oct 22, 2023
2046dfc
Big Settings integration
gbakeman Oct 22, 2023
a70e2fc
Small solution-level modifications
gbakeman Nov 7, 2023
32aeb67
Common library changes
gbakeman Nov 7, 2023
1872adf
New resources, translations, tweaks
gbakeman Nov 7, 2023
1d6d5ff
Return to .Net Framework 4.8
gbakeman Nov 9, 2023
f318487
Setup tweaks
gbakeman Nov 9, 2023
69ff205
Fix 'nominal in frequency' setting reading in Pref_Gui
gbakeman Jan 27, 2024
b390c63
Handle converting null SerializedProtectedString to string
gbakeman Jan 31, 2024
9988ddb
Check for old preferences earlier in WinNUT startup procedure
gbakeman Jan 31, 2024
7753411
Parameter export & delete updates
gbakeman Jan 31, 2024
4a1ecca
Change to UpgradePrefsDialog_ErrorEncountered string
gbakeman Jan 31, 2024
23f3229
Final UpgradePrefsDialog tweaks
gbakeman Jan 31, 2024
4d9d9bb
Merge branch 'dev-2.3' into 100-new-settings
gbakeman Jan 31, 2024
381ebaa
Handle nominal input frequency calibration setting change
gbakeman Jan 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix 'nominal in frequency' setting reading in Pref_Gui
In the old Registry preferences storage system, the 'frequency in nominal' value was stored as an index of the `Cbx_Freq_Input` combobox control in the `Pref_Gui` preferences form. However, the new Settings system stores the frequency value literally. To work around this, we set the combobox selectedindex value to the first full match with the loaded Settings value. When saving, the value of the selecteditem is read directly into the Settings value.
gbakeman committed Jan 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 69ff205cf83409450a211dc40491248db4c81fa4
6 changes: 3 additions & 3 deletions WinNUT_V2/WinNUT-Client/Pref_Gui.vb
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ Public Class Pref_Gui
My.Settings.NUT_AutoReconnect = Cb_Reconnect.Checked
My.Settings.CAL_VoltInMin = CInt(Tb_InV_Min.Text)
My.Settings.CAL_VoltInMax = CInt(Tb_InV_Max.Text)
My.Settings.CAL_FreqInNom = Cbx_Freq_Input.SelectedIndex
My.Settings.CAL_FreqInNom = Cbx_Freq_Input.SelectedItem
My.Settings.CAL_FreqInMin = CInt(Tb_InF_Min.Text)
My.Settings.CAL_FreqInMax = CInt(Tb_InF_Max.Text)
My.Settings.CAL_VoltOutMin = CInt(Tb_OutV_Min.Text)
@@ -116,7 +116,7 @@ Public Class Pref_Gui
Cb_Reconnect.Checked = My.Settings.NUT_AutoReconnect
Tb_InV_Min.Text = My.Settings.CAL_VoltInMin
Tb_InV_Max.Text = My.Settings.CAL_VoltInMax
Cbx_Freq_Input.SelectedIndex = My.Settings.CAL_FreqInNom
Cbx_Freq_Input.SelectedIndex = Cbx_Freq_Input.FindStringExact(My.Settings.CAL_FreqInNom)
Tb_InF_Min.Text = My.Settings.CAL_FreqInMin
Tb_InF_Max.Text = My.Settings.CAL_FreqInMax
Tb_OutV_Min.Text = My.Settings.CAL_VoltOutMin
@@ -188,7 +188,7 @@ Public Class Pref_Gui
Catch Except As Exception
IsShowed = False
Close()
LogFile.LogTracing("Error on Opening Pref_Gui.", LogLvl.LOG_ERROR, Me)
LogFile.LogTracing("Error on Opening Pref_Gui:" & vbNewLine & Except.ToString(), LogLvl.LOG_ERROR, Me)
End Try
End Sub