Mirrored_Repos/DisplayMagician
1
0
Fork 0
mirror of https://github.com/terrymacdonald/DisplayMagician.git synced 2024-08-30 18:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing program settings loglevel

Browse Source 
Had missed Fatal loglevel and missed
a mixedcase Error log level. Meant both
logging levels were broken. Now fixed.
This commit is contained in:
Terry MacDonald 2020-12-22 23:23:28 +13:00
parent 26796c9e46
commit 2148db3e95
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DisplayMagician/ProgramSettings.cs
View File

@ -64,9 +64,12 @@ namespace DisplayMagician
case "warn": case "warn":
_logLevel = NLog.LogLevel.Warn.ToString(); _logLevel = NLog.LogLevel.Warn.ToString();
break; break;
case "Error": case "error":
_logLevel = NLog.LogLevel.Error.ToString(); _logLevel = NLog.LogLevel.Error.ToString();
break; break;
case "fatal":
_logLevel = NLog.LogLevel.Fatal.ToString();
break;
default: default:
_logLevel = NLog.LogLevel.Warn.ToString(); _logLevel = NLog.LogLevel.Warn.ToString();
break; break;

42
DisplayMagician/UIForms/SettingsForm.cs
View File

@ -25,7 +25,7 @@ namespace DisplayMagician.UIForms
logLevelText.Add("Trace", "Full Application Trace (very large)"); logLevelText.Add("Trace", "Full Application Trace (very large)");
logLevelText.Add("Debug", "Detailed Debug messages (large)"); logLevelText.Add("Debug", "Detailed Debug messages (large)");
logLevelText.Add("Info", "Information, Warning and Error messages"); logLevelText.Add("Info", "Information, Warning and Error messages");
logLevelText.Add("Warn", "Warning and Error messages only"); logLevelText.Add("Warn", "Warning and Error messages only (Default)");
logLevelText.Add("Error", "Error messages only"); logLevelText.Add("Error", "Error messages only");
logLevelText.Add("Fatal", "Fatal Error messages only"); logLevelText.Add("Fatal", "Fatal Error messages only");
@ -36,38 +36,35 @@ namespace DisplayMagician.UIForms
private void SettingsForm_Load(object sender, EventArgs e) private void SettingsForm_Load(object sender, EventArgs e)
{ {
// Load the program settings
mySettings = Program.AppProgramSettings;
// setup minimise on start // setup minimise on start
if (mySettings.MinimiseOnStart) if (Program.AppProgramSettings.MinimiseOnStart)
cb_minimise_notification_area.Checked = true; cb_minimise_notification_area.Checked = true;
else else
cb_minimise_notification_area.Checked = false; cb_minimise_notification_area.Checked = false;
// setup loglevel on start // setup loglevel on start
switch (mySettings.LogLevel) switch (Program.AppProgramSettings.LogLevel)
{ {
case "Trace": case "Trace":
cmb_loglevel.SelectedItem = logLevelText["Trace"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Trace"]);
break; break;
case "Debug": case "Debug":
cmb_loglevel.SelectedItem = logLevelText["Debug"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Debug"]);
break; break;
case "Info": case "Info":
cmb_loglevel.SelectedItem = logLevelText["Info"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Info"]);
break; break;
case "Warn": case "Warn":
cmb_loglevel.SelectedItem = logLevelText["Warn"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Warn"]);
break; break;
case "Error": case "Error":
cmb_loglevel.SelectedItem = logLevelText["Error"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Error"]);
break; break;
case "Fatal": case "Fatal":
cmb_loglevel.SelectedItem = logLevelText["Fatal"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Fatal"]);
break; break;
default: default:
cmb_loglevel.SelectedItem = logLevelText["Warn"]; cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Warn"]);
break; break;
} }
@ -78,26 +75,25 @@ namespace DisplayMagician.UIForms
// save minimise on close // save minimise on close
if (cb_minimise_notification_area.Checked) if (cb_minimise_notification_area.Checked)
mySettings.MinimiseOnStart = true; Program.AppProgramSettings.MinimiseOnStart = true;
else else
mySettings.MinimiseOnStart = false; Program.AppProgramSettings.MinimiseOnStart = false;
// save loglevel on close // save loglevel on close
if (cmb_loglevel.SelectedItem.Equals(logLevelText["Trace"])) if (cmb_loglevel.SelectedItem.Equals(logLevelText["Trace"]))
mySettings.LogLevel = "Trace"; Program.AppProgramSettings.LogLevel = "Trace";
else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Debug"])) else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Debug"]))
mySettings.LogLevel = "Debug"; Program.AppProgramSettings.LogLevel = "Debug";
else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Info"])) else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Info"]))
mySettings.LogLevel = "Info"; Program.AppProgramSettings.LogLevel = "Info";
else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Warn"])) else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Warn"]))
mySettings.LogLevel = "Warn"; Program.AppProgramSettings.LogLevel = "Warn";
else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Error"])) else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Error"]))
mySettings.LogLevel = "Error"; Program.AppProgramSettings.LogLevel = "Error";
else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Fatal"])) else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Fatal"]))
mySettings.LogLevel = "Fatal"; Program.AppProgramSettings.LogLevel = "Fatal";
else else
mySettings.LogLevel = "Warn"; Program.AppProgramSettings.LogLevel = "Warn";
} }
private void btn_back_Click(object sender, EventArgs e) private void btn_back_Click(object sender, EventArgs e)