From 2148db3e95e811bdf67a3a1c3f88b32916fc975e Mon Sep 17 00:00:00 2001 From: Terry MacDonald Date: Tue, 22 Dec 2020 23:23:28 +1300 Subject: [PATCH] Fixing program settings loglevel Had missed Fatal loglevel and missed a mixedcase Error log level. Meant both logging levels were broken. Now fixed. --- DisplayMagician/ProgramSettings.cs | 5 ++- DisplayMagician/UIForms/SettingsForm.cs | 42 +++++++++++-------------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/DisplayMagician/ProgramSettings.cs b/DisplayMagician/ProgramSettings.cs index fa41eb6..cb5a5ae 100644 --- a/DisplayMagician/ProgramSettings.cs +++ b/DisplayMagician/ProgramSettings.cs @@ -64,9 +64,12 @@ namespace DisplayMagician case "warn": _logLevel = NLog.LogLevel.Warn.ToString(); break; - case "Error": + case "error": _logLevel = NLog.LogLevel.Error.ToString(); break; + case "fatal": + _logLevel = NLog.LogLevel.Fatal.ToString(); + break; default: _logLevel = NLog.LogLevel.Warn.ToString(); break; diff --git a/DisplayMagician/UIForms/SettingsForm.cs b/DisplayMagician/UIForms/SettingsForm.cs index d713682..52f28dd 100644 --- a/DisplayMagician/UIForms/SettingsForm.cs +++ b/DisplayMagician/UIForms/SettingsForm.cs @@ -25,7 +25,7 @@ namespace DisplayMagician.UIForms logLevelText.Add("Trace", "Full Application Trace (very large)"); logLevelText.Add("Debug", "Detailed Debug messages (large)"); 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("Fatal", "Fatal Error messages only"); @@ -36,38 +36,35 @@ namespace DisplayMagician.UIForms private void SettingsForm_Load(object sender, EventArgs e) { - // Load the program settings - mySettings = Program.AppProgramSettings; - // setup minimise on start - if (mySettings.MinimiseOnStart) + if (Program.AppProgramSettings.MinimiseOnStart) cb_minimise_notification_area.Checked = true; else cb_minimise_notification_area.Checked = false; // setup loglevel on start - switch (mySettings.LogLevel) + switch (Program.AppProgramSettings.LogLevel) { case "Trace": - cmb_loglevel.SelectedItem = logLevelText["Trace"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Trace"]); break; case "Debug": - cmb_loglevel.SelectedItem = logLevelText["Debug"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Debug"]); break; case "Info": - cmb_loglevel.SelectedItem = logLevelText["Info"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Info"]); break; case "Warn": - cmb_loglevel.SelectedItem = logLevelText["Warn"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Warn"]); break; case "Error": - cmb_loglevel.SelectedItem = logLevelText["Error"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Error"]); break; case "Fatal": - cmb_loglevel.SelectedItem = logLevelText["Fatal"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Fatal"]); break; default: - cmb_loglevel.SelectedItem = logLevelText["Warn"]; + cmb_loglevel.SelectedIndex = cmb_loglevel.FindStringExact(logLevelText["Warn"]); break; } @@ -78,26 +75,25 @@ namespace DisplayMagician.UIForms // save minimise on close if (cb_minimise_notification_area.Checked) - mySettings.MinimiseOnStart = true; + Program.AppProgramSettings.MinimiseOnStart = true; else - mySettings.MinimiseOnStart = false; + Program.AppProgramSettings.MinimiseOnStart = false; // save loglevel on close if (cmb_loglevel.SelectedItem.Equals(logLevelText["Trace"])) - mySettings.LogLevel = "Trace"; + Program.AppProgramSettings.LogLevel = "Trace"; else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Debug"])) - mySettings.LogLevel = "Debug"; + Program.AppProgramSettings.LogLevel = "Debug"; else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Info"])) - mySettings.LogLevel = "Info"; + Program.AppProgramSettings.LogLevel = "Info"; else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Warn"])) - mySettings.LogLevel = "Warn"; + Program.AppProgramSettings.LogLevel = "Warn"; else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Error"])) - mySettings.LogLevel = "Error"; + Program.AppProgramSettings.LogLevel = "Error"; else if (cmb_loglevel.SelectedItem.Equals(logLevelText["Fatal"])) - mySettings.LogLevel = "Fatal"; + Program.AppProgramSettings.LogLevel = "Fatal"; else - mySettings.LogLevel = "Warn"; - + Program.AppProgramSettings.LogLevel = "Warn"; } private void btn_back_Click(object sender, EventArgs e)