Merge pull request #336 from Hirogen/issue31

Hirogen · web-flow · commit e5fe811b7b6e · 2025-03-11T20:24:11.000+01:00
Issue31 missing again
diff --git a/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs b/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs
@@ -48,7 +48,7 @@ public static ILogLineColumnizer CloneColumnizer(ILogLineColumnizer columnizer)
                 object o = cti.Invoke(new object[] { });
                 if (o is IColumnizerConfigurator configurator)
                 {
-                    configurator.LoadConfig(ConfigManager.Settings.preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
+                    configurator.LoadConfig(ConfigManager.Settings.Preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
                 }
                 return (ILogLineColumnizer)o;
             }
diff --git a/src/LogExpert/Classes/Log/LogFileInfo.cs b/src/LogExpert/Classes/Log/LogFileInfo.cs
@@ -102,7 +102,7 @@ public bool FileExists
 
         public int PollInterval
         {
-            get { return ConfigManager.Settings.preferences.pollingInterval; }
+            get { return ConfigManager.Settings.Preferences.pollingInterval; }
         }
 
         public long LengthWithoutRetry
diff --git a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
@@ -72,7 +72,7 @@ public sealed override long Position
 
         public sealed override bool IsBufferComplete => true;
 
-        protected static int MaxLineLen => MAX_LINE_LEN;
+        protected static int MaxLineLen => ConfigManager.Settings.Preferences.MaxLineLength;
 
         #endregion
 
diff --git a/src/LogExpert/Classes/PaintHelper.cs b/src/LogExpert/Classes/PaintHelper.cs
@@ -26,7 +26,7 @@ internal class PaintHelper
 
         #region Properties
 
-        private static Preferences Preferences => ConfigManager.Settings.preferences;
+        private static Preferences Preferences => ConfigManager.Settings.Preferences;
 
         #endregion
 
diff --git a/src/LogExpert/Classes/PluginRegistry.cs b/src/LogExpert/Classes/PluginRegistry.cs
@@ -2,7 +2,9 @@
 using LogExpert.Config;
 using LogExpert.Entities;
 using LogExpert.Extensions;
+
 using NLog;
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs
@@ -39,7 +39,7 @@ public static class ColorMode
 
         public static void LoadColorMode()
         {
-            var preferences = ConfigManager.Settings.preferences;
+            var preferences = ConfigManager.Settings.Preferences;
 
             if (preferences.darkMode)
             {
diff --git a/src/LogExpert/Config/ConfigManager.cs b/src/LogExpert/Config/ConfigManager.cs
@@ -166,36 +166,36 @@ private Settings LoadOrCreateNew(FileSystemInfo fileInfo)
                     }
                 }
 
-                settings.preferences ??= new Preferences();
+                settings.Preferences ??= new Preferences();
 
-                settings.preferences.toolEntries ??= [];
+                settings.Preferences.toolEntries ??= [];
 
-                settings.preferences.columnizerMaskList ??= [];
+                settings.Preferences.columnizerMaskList ??= [];
 
                 settings.fileHistoryList ??= [];
 
                 settings.lastOpenFilesList ??= [];
 
                 settings.fileColors ??= [];
 
-                if (settings.preferences.showTailColor == Color.Empty)
+                if (settings.Preferences.showTailColor == Color.Empty)
                 {
-                    settings.preferences.showTailColor = Color.FromKnownColor(KnownColor.Blue);
+                    settings.Preferences.showTailColor = Color.FromKnownColor(KnownColor.Blue);
                 }
 
-                if (settings.preferences.timeSpreadColor == Color.Empty)
+                if (settings.Preferences.timeSpreadColor == Color.Empty)
                 {
-                    settings.preferences.timeSpreadColor = Color.Gray;
+                    settings.Preferences.timeSpreadColor = Color.Gray;
                 }
 
-                if (settings.preferences.bufferCount < 10)
+                if (settings.Preferences.bufferCount < 10)
                 {
-                    settings.preferences.bufferCount = 100;
+                    settings.Preferences.bufferCount = 100;
                 }
 
-                if (settings.preferences.linesPerBuffer < 1)
+                if (settings.Preferences.linesPerBuffer < 1)
                 {
-                    settings.preferences.linesPerBuffer = 500;
+                    settings.Preferences.linesPerBuffer = 500;
                 }
 
                 settings.filterList ??= [];
@@ -224,25 +224,25 @@ private Settings LoadOrCreateNew(FileSystemInfo fileInfo)
                     settings.hilightGroupList.Add(defaultGroup);
                 }
 
-                settings.preferences.highlightMaskList ??= [];
+                settings.Preferences.highlightMaskList ??= [];
 
-                if (settings.preferences.pollingInterval < 20)
+                if (settings.Preferences.pollingInterval < 20)
                 {
-                    settings.preferences.pollingInterval = 250;
+                    settings.Preferences.pollingInterval = 250;
                 }
 
-                settings.preferences.multiFileOptions ??= new MultiFileOptions();
+                settings.Preferences.multiFileOptions ??= new MultiFileOptions();
 
-                settings.preferences.defaultEncoding ??= Encoding.Default.HeaderName;
+                settings.Preferences.defaultEncoding ??= Encoding.Default.HeaderName;
 
-                if (settings.preferences.maximumFilterEntriesDisplayed == 0)
+                if (settings.Preferences.maximumFilterEntriesDisplayed == 0)
                 {
-                    settings.preferences.maximumFilterEntriesDisplayed = 20;
+                    settings.Preferences.maximumFilterEntriesDisplayed = 20;
                 }
 
-                if (settings.preferences.maximumFilterEntries == 0)
+                if (settings.Preferences.maximumFilterEntries == 0)
                 {
-                    settings.preferences.maximumFilterEntries = 30;
+                    settings.Preferences.maximumFilterEntries = 30;
                 }
 
                 SetBoundsWithinVirtualScreen(settings);
@@ -265,7 +265,7 @@ private void Save(Settings settings, SettingsFlags flags)
                 _logger.Info("Saving settings");
                 lock (this)
                 {
-                    string dir = Settings.preferences.PortableMode ? Application.StartupPath : ConfigDir;
+                    string dir = Settings.Preferences.PortableMode ? Application.StartupPath : ConfigDir;
 
                     if (!Directory.Exists(dir))
                     {
@@ -367,11 +367,11 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor
             if ((flags & ExportImportFlags.Other) == ExportImportFlags.Other)
             {
                 newSettings = ownSettings;
-                newSettings.preferences = ObjectClone.Clone(importSettings.preferences);
-                newSettings.preferences.columnizerMaskList = ownSettings.preferences.columnizerMaskList;
-                newSettings.preferences.highlightMaskList = ownSettings.preferences.highlightMaskList;
+                newSettings.Preferences = ObjectClone.Clone(importSettings.Preferences);
+                newSettings.Preferences.columnizerMaskList = ownSettings.Preferences.columnizerMaskList;
+                newSettings.Preferences.highlightMaskList = ownSettings.Preferences.highlightMaskList;
                 newSettings.hilightGroupList = ownSettings.hilightGroupList;
-                newSettings.preferences.toolEntries = ownSettings.preferences.toolEntries;
+                newSettings.Preferences.toolEntries = ownSettings.Preferences.toolEntries;
             }
             else
             {
@@ -380,19 +380,19 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor
 
             if ((flags & ExportImportFlags.ColumnizerMasks) == ExportImportFlags.ColumnizerMasks)
             {
-                newSettings.preferences.columnizerMaskList = ReplaceOrKeepExisting(flags, ownSettings.preferences.columnizerMaskList, importSettings.preferences.columnizerMaskList);
+                newSettings.Preferences.columnizerMaskList = ReplaceOrKeepExisting(flags, ownSettings.Preferences.columnizerMaskList, importSettings.Preferences.columnizerMaskList);
             }
             if ((flags & ExportImportFlags.HighlightMasks) == ExportImportFlags.HighlightMasks)
             {
-                newSettings.preferences.highlightMaskList = ReplaceOrKeepExisting(flags, ownSettings.preferences.highlightMaskList, importSettings.preferences.highlightMaskList);
+                newSettings.Preferences.highlightMaskList = ReplaceOrKeepExisting(flags, ownSettings.Preferences.highlightMaskList, importSettings.Preferences.highlightMaskList);
             }
             if ((flags & ExportImportFlags.HighlightSettings) == ExportImportFlags.HighlightSettings)
             {
                 newSettings.hilightGroupList = ReplaceOrKeepExisting(flags, ownSettings.hilightGroupList, importSettings.hilightGroupList);
             }
             if ((flags & ExportImportFlags.ToolEntries) == ExportImportFlags.ToolEntries)
             {
-                newSettings.preferences.toolEntries = ReplaceOrKeepExisting(flags, ownSettings.preferences.toolEntries, importSettings.preferences.toolEntries);
+                newSettings.Preferences.toolEntries = ReplaceOrKeepExisting(flags, ownSettings.Preferences.toolEntries, importSettings.Preferences.toolEntries);
             }
 
             return newSettings;
diff --git a/src/LogExpert/Config/Settings.cs b/src/LogExpert/Config/Settings.cs
@@ -45,7 +45,7 @@ public class Settings
 
         public List<string> lastOpenFilesList = [];
 
-        public Preferences preferences = new();
+        public Preferences Preferences { get; set; } = new();
 
         public RegexHistory regexHistory = new();
 
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
@@ -297,7 +297,7 @@ public LogWindow.LogWindow CurrentLogWindow
 
         public SearchParams SearchParams { get; private set; } = new SearchParams();
 
-        public Preferences Preferences => ConfigManager.Settings.preferences;
+        public Preferences Preferences => ConfigManager.Settings.Preferences;
 
         public List<HilightGroup> HilightGroupList { get; private set; } = [];
 
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs
@@ -44,7 +44,7 @@ private void OnLogTabWindowLoad(object sender, EventArgs e)
                 }
             }
 
-            if (ConfigManager.Settings.preferences.openLastFiles && _startupFileNames == null)
+            if (ConfigManager.Settings.Preferences.openLastFiles && _startupFileNames == null)
             {
                 List<string> tmpList = ObjectClone.Clone(ConfigManager.Settings.lastOpenFilesList);
 
@@ -81,7 +81,7 @@ private void OnLogTabWindowClosing(object sender, CancelEventArgs e)
                 _ledThread.Join();
 
                 IList<LogWindow.LogWindow> deleteLogWindowList = new List<LogWindow.LogWindow>();
-                ConfigManager.Settings.alwaysOnTop = TopMost && ConfigManager.Settings.preferences.allowOnlyOneInstance;
+                ConfigManager.Settings.alwaysOnTop = TopMost && ConfigManager.Settings.Preferences.allowOnlyOneInstance;
                 SaveLastOpenFilesList();
 
                 foreach (LogWindow.LogWindow logWindow in _logWindowList)
@@ -952,7 +952,7 @@ private void OnLockInstanceToolStripMenuItemClick(object sender, EventArgs e)
 
         private void OnOptionToolStripMenuItemDropDownOpening(object sender, EventArgs e)
         {
-            lockInstanceToolStripMenuItem.Enabled = !ConfigManager.Settings.preferences.allowOnlyOneInstance;
+            lockInstanceToolStripMenuItem.Enabled = !ConfigManager.Settings.Preferences.allowOnlyOneInstance;
             lockInstanceToolStripMenuItem.Checked = StaticData.CurrentLockedMainWindow == this;
         }
 
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs
@@ -68,7 +68,7 @@ private void InitBookmarkWindow()
             _bookmarkWindow = new BookmarkWindow();
             _bookmarkWindow.HideOnClose = true;
             _bookmarkWindow.ShowHint = DockState.DockBottom;
-            _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, SettingsFlags.All);
+            _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, SettingsFlags.All);
             _bookmarkWindow.VisibleChanged += OnBookmarkWindowVisibleChanged;
             _firstBookmarkWindowShow = true;
         }
@@ -120,15 +120,15 @@ private void SetTooltipText(LogWindow.LogWindow logWindow, string logFileName)
 
         private void FillDefaultEncodingFromSettings(EncodingOptions encodingOptions)
         {
-            if (ConfigManager.Settings.preferences.defaultEncoding != null)
+            if (ConfigManager.Settings.Preferences.defaultEncoding != null)
             {
                 try
                 {
-                    encodingOptions.DefaultEncoding = Encoding.GetEncoding(ConfigManager.Settings.preferences.defaultEncoding);
+                    encodingOptions.DefaultEncoding = Encoding.GetEncoding(ConfigManager.Settings.Preferences.defaultEncoding);
                 }
                 catch (ArgumentException)
                 {
-                    _logger.Warn("Encoding " + ConfigManager.Settings.preferences.defaultEncoding + " is not a valid encoding");
+                    _logger.Warn("Encoding " + ConfigManager.Settings.Preferences.defaultEncoding + " is not a valid encoding");
                     encodingOptions.DefaultEncoding = null;
                 }
             }
@@ -426,7 +426,7 @@ private void LoadFiles(string[] names, bool invertLogic)
                 return;
             }
 
-            MultiFileOption option = ConfigManager.Settings.preferences.multiFileOption;
+            MultiFileOption option = ConfigManager.Settings.Preferences.multiFileOption;
             if (option == MultiFileOption.Ask)
             {
                 MultiLoadRequestDialog dlg = new();
@@ -622,7 +622,7 @@ private void GuiStateUpdateWorker(GuiStateArgs e)
             cellSelectModeToolStripMenuItem.Checked = e.CellSelectMode;
             RefreshEncodingMenuBar(e.CurrentEncoding);
 
-            if (e.TimeshiftPossible && ConfigManager.Settings.preferences.timestampControl)
+            if (e.TimeshiftPossible && ConfigManager.Settings.Preferences.timestampControl)
             {
                 dragControlDateTime.MinDateTime = e.MinTimestamp;
                 dragControlDateTime.MaxDateTime = e.MaxTimestamp;
@@ -922,12 +922,12 @@ private void RefreshEncodingMenuBar(Encoding encoding)
 
         private void OpenSettings(int tabToOpen)
         {
-            SettingsDialog dlg = new(ConfigManager.Settings.preferences, this, tabToOpen);
+            SettingsDialog dlg = new(ConfigManager.Settings.Preferences, this, tabToOpen);
             dlg.TopMost = TopMost;
 
             if (DialogResult.OK == dlg.ShowDialog())
             {
-                ConfigManager.Settings.preferences = dlg.Preferences;
+                ConfigManager.Settings.Preferences = dlg.Preferences;
                 ConfigManager.Save(SettingsFlags.Settings);
                 NotifyWindowsForChangedPrefs(SettingsFlags.Settings);
             }
@@ -942,11 +942,11 @@ private void NotifyWindowsForChangedPrefs(SettingsFlags flags)
             {
                 foreach (LogWindow.LogWindow logWindow in _logWindowList)
                 {
-                    logWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, flags);
+                    logWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags);
                 }
             }
 
-            _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, flags);
+            _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags);
 
             HilightGroupList = ConfigManager.Settings.hilightGroupList;
             if ((flags & SettingsFlags.HighlightSettings) == SettingsFlags.HighlightSettings)
@@ -960,7 +960,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags)
             if ((flags & SettingsFlags.WindowPosition) == SettingsFlags.WindowPosition)
             {
                 TopMost = alwaysOnTopToolStripMenuItem.Checked = settings.alwaysOnTop;
-                dragControlDateTime.DragOrientation = settings.preferences.timestampControlDragOrientation;
+                dragControlDateTime.DragOrientation = settings.Preferences.timestampControlDragOrientation;
                 hideLineColumnToolStripMenuItem.Checked = settings.hideLineColumn;
             }
 
@@ -971,7 +971,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags)
 
             if ((flags & SettingsFlags.GuiOrColors) == SettingsFlags.GuiOrColors)
             {
-                SetTabIcons(settings.preferences);
+                SetTabIcons(settings.Preferences);
             }
 
             if ((flags & SettingsFlags.ToolSettings) == SettingsFlags.ToolSettings)
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs
@@ -233,7 +233,7 @@ public void ScrollAllTabsToTimestamp(DateTime timestamp, LogWindow.LogWindow sen
 
         public ILogLineColumnizer FindColumnizerByFileMask(string fileName)
         {
-            foreach (ColumnizerMaskEntry entry in ConfigManager.Settings.preferences.columnizerMaskList)
+            foreach (ColumnizerMaskEntry entry in ConfigManager.Settings.Preferences.columnizerMaskList)
             {
                 if (entry.mask != null)
                 {
@@ -258,7 +258,7 @@ public ILogLineColumnizer FindColumnizerByFileMask(string fileName)
 
         public HilightGroup FindHighlightGroupByFileMask(string fileName)
         {
-            foreach (HighlightMaskEntry entry in ConfigManager.Settings.preferences.highlightMaskList)
+            foreach (HighlightMaskEntry entry in ConfigManager.Settings.Preferences.highlightMaskList)
             {
                 if (entry.mask != null)
                 {
diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs
@@ -196,7 +196,7 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
                 filterComboBox.Items.Add(item);
             }
 
-            filterComboBox.DropDownHeight = filterComboBox.ItemHeight * ConfigManager.Settings.preferences.maximumFilterEntriesDisplayed;
+            filterComboBox.DropDownHeight = filterComboBox.ItemHeight * ConfigManager.Settings.Preferences.maximumFilterEntriesDisplayed;
             AutoResizeFilterBox();
 
             filterRegexCheckBox.Checked = _filterParams.isRegex;
@@ -494,7 +494,7 @@ public string Title
 
         public string ForcedPersistenceFileName { get; set; } = null;
 
-        public Preferences Preferences => ConfigManager.Settings.preferences;
+        public Preferences Preferences => ConfigManager.Settings.Preferences;
 
         public string GivenFileName { get; set; } = null;
 
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs
@@ -1967,7 +1967,7 @@ private async void FilterSearch(string text)
             _filterParams.lowerSearchText = text.ToLower();
             ConfigManager.Settings.filterHistoryList.Remove(text);
             ConfigManager.Settings.filterHistoryList.Insert(0, text);
-            int maxHistory = ConfigManager.Settings.preferences.maximumFilterEntries;
+            int maxHistory = ConfigManager.Settings.Preferences.maximumFilterEntries;
 
             if (ConfigManager.Settings.filterHistoryList.Count > maxHistory)
             {
@@ -2042,7 +2042,7 @@ private async void FilterSearch(string text)
             Settings settings = ConfigManager.Settings;
 
             //FilterFx fx = settings.preferences.multiThreadFilter ? MultiThreadedFilter : new FilterFx(Filter);
-            FilterFxAction = settings.preferences.multiThreadFilter ? MultiThreadedFilter : Filter;
+            FilterFxAction = settings.Preferences.multiThreadFilter ? MultiThreadedFilter : Filter;
 
             //Task.Run(() => fx.Invoke(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList));
             Task filterFxActionTask = Task.Run(() => Filter(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList));
diff --git a/src/LogExpert/Dialogs/FilterSelectorForm.cs b/src/LogExpert/Dialogs/FilterSelectorForm.cs
@@ -84,7 +84,7 @@ private void OnConfigButtonClick(object sender, EventArgs e)
             {
                 string configDir = ConfigManager.ConfigDir;
 
-                if (ConfigManager.Settings.preferences.PortableMode)
+                if (ConfigManager.Settings.Preferences.PortableMode)
                 {
                     configDir = ConfigManager.PortableModeDir;
                 }
diff --git a/src/LogExpert/Dialogs/SettingsDialog.cs b/src/LogExpert/Dialogs/SettingsDialog.cs
diff --git a/src/LogExpert/Program.cs b/src/LogExpert/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static ILogLineColumnizer CloneColumnizer(ILogLineColumnizer columnizer)`
`48`	`48`	`object o = cti.Invoke(new object[] { });`
`49`	`49`	`if (o is IColumnizerConfigurator configurator)`
`50`	`50`	`{`
`51`		`- configurator.LoadConfig(ConfigManager.Settings.preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);`
	`51`	`+ configurator.LoadConfig(ConfigManager.Settings.Preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);`
`52`	`52`	`}`
`53`	`53`	`return (ILogLineColumnizer)o;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public bool FileExists`
`102`	`102`
`103`	`103`	`public int PollInterval`
`104`	`104`	`{`
`105`		`- get { return ConfigManager.Settings.preferences.pollingInterval; }`
	`105`	`+ get { return ConfigManager.Settings.Preferences.pollingInterval; }`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public long LengthWithoutRetry`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static class ColorMode`
`39`	`39`
`40`	`40`	`public static void LoadColorMode()`
`41`	`41`	`{`
`42`		`- var preferences = ConfigManager.Settings.preferences;`
	`42`	`+ var preferences = ConfigManager.Settings.Preferences;`
`43`	`43`
`44`	`44`	`if (preferences.darkMode)`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -166,36 +166,36 @@ private Settings LoadOrCreateNew(FileSystemInfo fileInfo)`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- settings.preferences ??= new Preferences();`
	`169`	`+ settings.Preferences ??= new Preferences();`
`170`	`170`
`171`		`- settings.preferences.toolEntries ??= [];`
	`171`	`+ settings.Preferences.toolEntries ??= [];`
`172`	`172`
`173`		`- settings.preferences.columnizerMaskList ??= [];`
	`173`	`+ settings.Preferences.columnizerMaskList ??= [];`
`174`	`174`
`175`	`175`	`settings.fileHistoryList ??= [];`
`176`	`176`
`177`	`177`	`settings.lastOpenFilesList ??= [];`
`178`	`178`
`179`	`179`	`settings.fileColors ??= [];`
`180`	`180`
`181`		`- if (settings.preferences.showTailColor == Color.Empty)`
	`181`	`+ if (settings.Preferences.showTailColor == Color.Empty)`
`182`	`182`	`{`
`183`		`- settings.preferences.showTailColor = Color.FromKnownColor(KnownColor.Blue);`
	`183`	`+ settings.Preferences.showTailColor = Color.FromKnownColor(KnownColor.Blue);`
`184`	`184`	`}`
`185`	`185`
`186`		`- if (settings.preferences.timeSpreadColor == Color.Empty)`
	`186`	`+ if (settings.Preferences.timeSpreadColor == Color.Empty)`
`187`	`187`	`{`
`188`		`- settings.preferences.timeSpreadColor = Color.Gray;`
	`188`	`+ settings.Preferences.timeSpreadColor = Color.Gray;`
`189`	`189`	`}`
`190`	`190`
`191`		`- if (settings.preferences.bufferCount < 10)`
	`191`	`+ if (settings.Preferences.bufferCount < 10)`
`192`	`192`	`{`
`193`		`- settings.preferences.bufferCount = 100;`
	`193`	`+ settings.Preferences.bufferCount = 100;`
`194`	`194`	`}`
`195`	`195`
`196`		`- if (settings.preferences.linesPerBuffer < 1)`
	`196`	`+ if (settings.Preferences.linesPerBuffer < 1)`
`197`	`197`	`{`
`198`		`- settings.preferences.linesPerBuffer = 500;`
	`198`	`+ settings.Preferences.linesPerBuffer = 500;`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`settings.filterList ??= [];`
`@@ -224,25 +224,25 @@ private Settings LoadOrCreateNew(FileSystemInfo fileInfo)`
`224`	`224`	`settings.hilightGroupList.Add(defaultGroup);`
`225`	`225`	`}`
`226`	`226`
`227`		`- settings.preferences.highlightMaskList ??= [];`
	`227`	`+ settings.Preferences.highlightMaskList ??= [];`
`228`	`228`
`229`		`- if (settings.preferences.pollingInterval < 20)`
	`229`	`+ if (settings.Preferences.pollingInterval < 20)`
`230`	`230`	`{`
`231`		`- settings.preferences.pollingInterval = 250;`
	`231`	`+ settings.Preferences.pollingInterval = 250;`
`232`	`232`	`}`
`233`	`233`
`234`		`- settings.preferences.multiFileOptions ??= new MultiFileOptions();`
	`234`	`+ settings.Preferences.multiFileOptions ??= new MultiFileOptions();`
`235`	`235`
`236`		`- settings.preferences.defaultEncoding ??= Encoding.Default.HeaderName;`
	`236`	`+ settings.Preferences.defaultEncoding ??= Encoding.Default.HeaderName;`
`237`	`237`
`238`		`- if (settings.preferences.maximumFilterEntriesDisplayed == 0)`
	`238`	`+ if (settings.Preferences.maximumFilterEntriesDisplayed == 0)`
`239`	`239`	`{`
`240`		`- settings.preferences.maximumFilterEntriesDisplayed = 20;`
	`240`	`+ settings.Preferences.maximumFilterEntriesDisplayed = 20;`
`241`	`241`	`}`
`242`	`242`
`243`		`- if (settings.preferences.maximumFilterEntries == 0)`
	`243`	`+ if (settings.Preferences.maximumFilterEntries == 0)`
`244`	`244`	`{`
`245`		`- settings.preferences.maximumFilterEntries = 30;`
	`245`	`+ settings.Preferences.maximumFilterEntries = 30;`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`SetBoundsWithinVirtualScreen(settings);`
`@@ -265,7 +265,7 @@ private void Save(Settings settings, SettingsFlags flags)`
`265`	`265`	`_logger.Info("Saving settings");`
`266`	`266`	`lock (this)`
`267`	`267`	`{`
`268`		`- string dir = Settings.preferences.PortableMode ? Application.StartupPath : ConfigDir;`
	`268`	`+ string dir = Settings.Preferences.PortableMode ? Application.StartupPath : ConfigDir;`
`269`	`269`
`270`	`270`	`if (!Directory.Exists(dir))`
`271`	`271`	`{`
`@@ -367,11 +367,11 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor`
`367`	`367`	`if ((flags & ExportImportFlags.Other) == ExportImportFlags.Other)`
`368`	`368`	`{`
`369`	`369`	`newSettings = ownSettings;`
`370`		`- newSettings.preferences = ObjectClone.Clone(importSettings.preferences);`
`371`		`- newSettings.preferences.columnizerMaskList = ownSettings.preferences.columnizerMaskList;`
`372`		`- newSettings.preferences.highlightMaskList = ownSettings.preferences.highlightMaskList;`
	`370`	`+ newSettings.Preferences = ObjectClone.Clone(importSettings.Preferences);`
	`371`	`+ newSettings.Preferences.columnizerMaskList = ownSettings.Preferences.columnizerMaskList;`
	`372`	`+ newSettings.Preferences.highlightMaskList = ownSettings.Preferences.highlightMaskList;`
`373`	`373`	`newSettings.hilightGroupList = ownSettings.hilightGroupList;`
`374`		`- newSettings.preferences.toolEntries = ownSettings.preferences.toolEntries;`
	`374`	`+ newSettings.Preferences.toolEntries = ownSettings.Preferences.toolEntries;`
`375`	`375`	`}`
`376`	`376`	`else`
`377`	`377`	`{`
`@@ -380,19 +380,19 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor`
`380`	`380`
`381`	`381`	`if ((flags & ExportImportFlags.ColumnizerMasks) == ExportImportFlags.ColumnizerMasks)`
`382`	`382`	`{`
`383`		`- newSettings.preferences.columnizerMaskList = ReplaceOrKeepExisting(flags, ownSettings.preferences.columnizerMaskList, importSettings.preferences.columnizerMaskList);`
	`383`	`+ newSettings.Preferences.columnizerMaskList = ReplaceOrKeepExisting(flags, ownSettings.Preferences.columnizerMaskList, importSettings.Preferences.columnizerMaskList);`
`384`	`384`	`}`
`385`	`385`	`if ((flags & ExportImportFlags.HighlightMasks) == ExportImportFlags.HighlightMasks)`
`386`	`386`	`{`
`387`		`- newSettings.preferences.highlightMaskList = ReplaceOrKeepExisting(flags, ownSettings.preferences.highlightMaskList, importSettings.preferences.highlightMaskList);`
	`387`	`+ newSettings.Preferences.highlightMaskList = ReplaceOrKeepExisting(flags, ownSettings.Preferences.highlightMaskList, importSettings.Preferences.highlightMaskList);`
`388`	`388`	`}`
`389`	`389`	`if ((flags & ExportImportFlags.HighlightSettings) == ExportImportFlags.HighlightSettings)`
`390`	`390`	`{`
`391`	`391`	`newSettings.hilightGroupList = ReplaceOrKeepExisting(flags, ownSettings.hilightGroupList, importSettings.hilightGroupList);`
`392`	`392`	`}`
`393`	`393`	`if ((flags & ExportImportFlags.ToolEntries) == ExportImportFlags.ToolEntries)`
`394`	`394`	`{`
`395`		`- newSettings.preferences.toolEntries = ReplaceOrKeepExisting(flags, ownSettings.preferences.toolEntries, importSettings.preferences.toolEntries);`
	`395`	`+ newSettings.Preferences.toolEntries = ReplaceOrKeepExisting(flags, ownSettings.Preferences.toolEntries, importSettings.Preferences.toolEntries);`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`return newSettings;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private void OnLogTabWindowLoad(object sender, EventArgs e)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- if (ConfigManager.Settings.preferences.openLastFiles && _startupFileNames == null)`
	`47`	`+ if (ConfigManager.Settings.Preferences.openLastFiles && _startupFileNames == null)`
`48`	`48`	`{`
`49`	`49`	`List<string> tmpList = ObjectClone.Clone(ConfigManager.Settings.lastOpenFilesList);`
`50`	`50`
`@@ -81,7 +81,7 @@ private void OnLogTabWindowClosing(object sender, CancelEventArgs e)`
`81`	`81`	`_ledThread.Join();`
`82`	`82`
`83`	`83`	`IList<LogWindow.LogWindow> deleteLogWindowList = new List<LogWindow.LogWindow>();`
`84`		`- ConfigManager.Settings.alwaysOnTop = TopMost && ConfigManager.Settings.preferences.allowOnlyOneInstance;`
	`84`	`+ ConfigManager.Settings.alwaysOnTop = TopMost && ConfigManager.Settings.Preferences.allowOnlyOneInstance;`
`85`	`85`	`SaveLastOpenFilesList();`
`86`	`86`
`87`	`87`	`foreach (LogWindow.LogWindow logWindow in _logWindowList)`
`@@ -952,7 +952,7 @@ private void OnLockInstanceToolStripMenuItemClick(object sender, EventArgs e)`
`952`	`952`
`953`	`953`	`private void OnOptionToolStripMenuItemDropDownOpening(object sender, EventArgs e)`
`954`	`954`	`{`
`955`		`- lockInstanceToolStripMenuItem.Enabled = !ConfigManager.Settings.preferences.allowOnlyOneInstance;`
	`955`	`+ lockInstanceToolStripMenuItem.Enabled = !ConfigManager.Settings.Preferences.allowOnlyOneInstance;`
`956`	`956`	`lockInstanceToolStripMenuItem.Checked = StaticData.CurrentLockedMainWindow == this;`
`957`	`957`	`}`
`958`	`958`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private void InitBookmarkWindow()`
`68`	`68`	`_bookmarkWindow = new BookmarkWindow();`
`69`	`69`	`_bookmarkWindow.HideOnClose = true;`
`70`	`70`	`_bookmarkWindow.ShowHint = DockState.DockBottom;`
`71`		`- _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, SettingsFlags.All);`
	`71`	`+ _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, SettingsFlags.All);`
`72`	`72`	`_bookmarkWindow.VisibleChanged += OnBookmarkWindowVisibleChanged;`
`73`	`73`	`_firstBookmarkWindowShow = true;`
`74`	`74`	`}`
`@@ -120,15 +120,15 @@ private void SetTooltipText(LogWindow.LogWindow logWindow, string logFileName)`
`120`	`120`
`121`	`121`	`private void FillDefaultEncodingFromSettings(EncodingOptions encodingOptions)`
`122`	`122`	`{`
`123`		`- if (ConfigManager.Settings.preferences.defaultEncoding != null)`
	`123`	`+ if (ConfigManager.Settings.Preferences.defaultEncoding != null)`
`124`	`124`	`{`
`125`	`125`	`try`
`126`	`126`	`{`
`127`		`- encodingOptions.DefaultEncoding = Encoding.GetEncoding(ConfigManager.Settings.preferences.defaultEncoding);`
	`127`	`+ encodingOptions.DefaultEncoding = Encoding.GetEncoding(ConfigManager.Settings.Preferences.defaultEncoding);`
`128`	`128`	`}`
`129`	`129`	`catch (ArgumentException)`
`130`	`130`	`{`
`131`		`- _logger.Warn("Encoding " + ConfigManager.Settings.preferences.defaultEncoding + " is not a valid encoding");`
	`131`	`+ _logger.Warn("Encoding " + ConfigManager.Settings.Preferences.defaultEncoding + " is not a valid encoding");`
`132`	`132`	`encodingOptions.DefaultEncoding = null;`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -426,7 +426,7 @@ private void LoadFiles(string[] names, bool invertLogic)`
`426`	`426`	`return;`
`427`	`427`	`}`
`428`	`428`
`429`		`- MultiFileOption option = ConfigManager.Settings.preferences.multiFileOption;`
	`429`	`+ MultiFileOption option = ConfigManager.Settings.Preferences.multiFileOption;`
`430`	`430`	`if (option == MultiFileOption.Ask)`
`431`	`431`	`{`
`432`	`432`	`MultiLoadRequestDialog dlg = new();`
`@@ -622,7 +622,7 @@ private void GuiStateUpdateWorker(GuiStateArgs e)`
`622`	`622`	`cellSelectModeToolStripMenuItem.Checked = e.CellSelectMode;`
`623`	`623`	`RefreshEncodingMenuBar(e.CurrentEncoding);`
`624`	`624`
`625`		`- if (e.TimeshiftPossible && ConfigManager.Settings.preferences.timestampControl)`
	`625`	`+ if (e.TimeshiftPossible && ConfigManager.Settings.Preferences.timestampControl)`
`626`	`626`	`{`
`627`	`627`	`dragControlDateTime.MinDateTime = e.MinTimestamp;`
`628`	`628`	`dragControlDateTime.MaxDateTime = e.MaxTimestamp;`
`@@ -922,12 +922,12 @@ private void RefreshEncodingMenuBar(Encoding encoding)`
`922`	`922`
`923`	`923`	`private void OpenSettings(int tabToOpen)`
`924`	`924`	`{`
`925`		`- SettingsDialog dlg = new(ConfigManager.Settings.preferences, this, tabToOpen);`
	`925`	`+ SettingsDialog dlg = new(ConfigManager.Settings.Preferences, this, tabToOpen);`
`926`	`926`	`dlg.TopMost = TopMost;`
`927`	`927`
`928`	`928`	`if (DialogResult.OK == dlg.ShowDialog())`
`929`	`929`	`{`
`930`		`- ConfigManager.Settings.preferences = dlg.Preferences;`
	`930`	`+ ConfigManager.Settings.Preferences = dlg.Preferences;`
`931`	`931`	`ConfigManager.Save(SettingsFlags.Settings);`
`932`	`932`	`NotifyWindowsForChangedPrefs(SettingsFlags.Settings);`
`933`	`933`	`}`
`@@ -942,11 +942,11 @@ private void NotifyWindowsForChangedPrefs(SettingsFlags flags)`
`942`	`942`	`{`
`943`	`943`	`foreach (LogWindow.LogWindow logWindow in _logWindowList)`
`944`	`944`	`{`
`945`		`- logWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, flags);`
	`945`	`+ logWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags);`
`946`	`946`	`}`
`947`	`947`	`}`
`948`	`948`
`949`		`- _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, flags);`
	`949`	`+ _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags);`
`950`	`950`
`951`	`951`	`HilightGroupList = ConfigManager.Settings.hilightGroupList;`
`952`	`952`	`if ((flags & SettingsFlags.HighlightSettings) == SettingsFlags.HighlightSettings)`
`@@ -960,7 +960,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags)`
`960`	`960`	`if ((flags & SettingsFlags.WindowPosition) == SettingsFlags.WindowPosition)`
`961`	`961`	`{`
`962`	`962`	`TopMost = alwaysOnTopToolStripMenuItem.Checked = settings.alwaysOnTop;`
`963`		`- dragControlDateTime.DragOrientation = settings.preferences.timestampControlDragOrientation;`
	`963`	`+ dragControlDateTime.DragOrientation = settings.Preferences.timestampControlDragOrientation;`
`964`	`964`	`hideLineColumnToolStripMenuItem.Checked = settings.hideLineColumn;`
`965`	`965`	`}`
`966`	`966`
`@@ -971,7 +971,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags)`
`971`	`971`
`972`	`972`	`if ((flags & SettingsFlags.GuiOrColors) == SettingsFlags.GuiOrColors)`
`973`	`973`	`{`
`974`		`- SetTabIcons(settings.preferences);`
	`974`	`+ SetTabIcons(settings.Preferences);`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`if ((flags & SettingsFlags.ToolSettings) == SettingsFlags.ToolSettings)`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public void ScrollAllTabsToTimestamp(DateTime timestamp, LogWindow.LogWindow sen`
`233`	`233`
`234`	`234`	`public ILogLineColumnizer FindColumnizerByFileMask(string fileName)`
`235`	`235`	`{`
`236`		`- foreach (ColumnizerMaskEntry entry in ConfigManager.Settings.preferences.columnizerMaskList)`
	`236`	`+ foreach (ColumnizerMaskEntry entry in ConfigManager.Settings.Preferences.columnizerMaskList)`
`237`	`237`	`{`
`238`	`238`	`if (entry.mask != null)`
`239`	`239`	`{`
`@@ -258,7 +258,7 @@ public ILogLineColumnizer FindColumnizerByFileMask(string fileName)`
`258`	`258`
`259`	`259`	`public HilightGroup FindHighlightGroupByFileMask(string fileName)`
`260`	`260`	`{`
`261`		`- foreach (HighlightMaskEntry entry in ConfigManager.Settings.preferences.highlightMaskList)`
	`261`	`+ foreach (HighlightMaskEntry entry in ConfigManager.Settings.Preferences.highlightMaskList)`
`262`	`262`	`{`
`263`	`263`	`if (entry.mask != null)`
`264`	`264`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private void OnConfigButtonClick(object sender, EventArgs e)`
`84`	`84`	`{`
`85`	`85`	`string configDir = ConfigManager.ConfigDir;`
`86`	`86`
`87`		`- if (ConfigManager.Settings.preferences.PortableMode)`
	`87`	`+ if (ConfigManager.Settings.Preferences.PortableMode)`
`88`	`88`	`{`
`89`	`89`	`configDir = ConfigManager.PortableModeDir;`
`90`	`90`	`}`