diff --git a/MPF.Library/Data/Options.cs b/MPF.Library/Data/Options.cs index b3907590..ed188427 100644 --- a/MPF.Library/Data/Options.cs +++ b/MPF.Library/Data/Options.cs @@ -333,6 +333,12 @@ namespace MPF.Data set { _settings["OpenLogWindowAtStartup"] = value.ToString(); } } + public bool EnableLogFormatting + { + get { return GetBooleanSetting(_settings, "EnableFancyLog", true); } + set { _settings["EnableFancyLog"] = value.ToString(); } + } + public bool EnableProgressProcessing { get { return GetBooleanSetting(_settings, "EnableProgressProcessing", true); } diff --git a/MPF/UserControls/LogOutput.xaml.cs b/MPF/UserControls/LogOutput.xaml.cs index 087d8bd1..62ee399b 100644 --- a/MPF/UserControls/LogOutput.xaml.cs +++ b/MPF/UserControls/LogOutput.xaml.cs @@ -378,6 +378,13 @@ namespace MPF.UserControls try { + // If we're not processing log formatting, just append and continue + if (!ViewModels.OptionsViewModel.EnableLogFormatting) + { + AppendToTextBox(nextLogLine); + return; + } + // Get last line lastLine = lastLine ?? GetLastLine(); diff --git a/MPF/ViewModels.cs b/MPF/ViewModels.cs index d4c317d8..e9eb91f0 100644 --- a/MPF/ViewModels.cs +++ b/MPF/ViewModels.cs @@ -12,6 +12,11 @@ get { return _uiOptions.Options.VerboseLogging; } } + public bool EnableLogFormatting + { + get { return _uiOptions.Options.EnableLogFormatting; } + } + public bool EnableProgressProcessing { get { return _uiOptions.Options.EnableProgressProcessing; } diff --git a/MPF/Windows/OptionsWindow.xaml b/MPF/Windows/OptionsWindow.xaml index c5d8a0be..14a286c1 100644 --- a/MPF/Windows/OptionsWindow.xaml +++ b/MPF/Windows/OptionsWindow.xaml @@ -228,8 +228,13 @@ ToolTip="Open the log panel when the program launches" Margin="0,4" /> + +