From 13fecfa395bc8e3c4dfbfdbf0c6de0d923c87183 Mon Sep 17 00:00:00 2001 From: Fred Kuipers Date: Tue, 20 Jul 2021 19:35:33 -0400 Subject: [PATCH] Add a setting to control pre-reading behavior Also makes adding new rows to the settings grid a little more dynamic. --- ObservatoryCore/LogMonitor.cs | 5 +- ObservatoryCore/Properties/Core.Designer.cs | 15 ++++ ObservatoryCore/UI/Views/BasicUIView.axaml.cs | 71 +++++++++++++++++-- 3 files changed, 82 insertions(+), 9 deletions(-) diff --git a/ObservatoryCore/LogMonitor.cs b/ObservatoryCore/LogMonitor.cs index 968802b..f5d1eb9 100644 --- a/ObservatoryCore/LogMonitor.cs +++ b/ObservatoryCore/LogMonitor.cs @@ -103,8 +103,9 @@ namespace Observatory public void PrereadJournals() { - // TODO: use the configured journal path, not the "default" detected path. - DirectoryInfo logDirectory = GetJournalFolder(String.Empty); + if (!Properties.Core.Default.TryPrimeSystemContextOnStartMonitor) return; + + DirectoryInfo logDirectory = GetJournalFolder(Properties.Core.Default.JournalFolder); var files = logDirectory.GetFiles("Journal.????????????.??.log"); // Read at most the last two files (in case we were launched after the game and the latest diff --git a/ObservatoryCore/Properties/Core.Designer.cs b/ObservatoryCore/Properties/Core.Designer.cs index edf8603..e7c3559 100644 --- a/ObservatoryCore/Properties/Core.Designer.cs +++ b/ObservatoryCore/Properties/Core.Designer.cs @@ -58,5 +58,20 @@ namespace Observatory.Properties { this["NativeNotify"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool TryPrimeSystemContextOnStartMonitor + { + get + { + return ((bool)(this["TryPrimeSystemContextOnStartMonitor"])); + } + set + { + this["TryPrimeSystemContextOnStartMonitor"] = value; + } + } } } diff --git a/ObservatoryCore/UI/Views/BasicUIView.axaml.cs b/ObservatoryCore/UI/Views/BasicUIView.axaml.cs index bd18b8f..7d407b0 100644 --- a/ObservatoryCore/UI/Views/BasicUIView.axaml.cs +++ b/ObservatoryCore/UI/Views/BasicUIView.axaml.cs @@ -136,15 +136,20 @@ namespace Observatory.UI.Views RowDefinitions rows = new() { + new RowDefinition() { Height = new GridLength(0, GridUnitType.Auto) }, new RowDefinition() { Height = new GridLength(0, GridUnitType.Auto) }, new RowDefinition() { Height = new GridLength(0, GridUnitType.Auto) }, new RowDefinition() { Height = new GridLength(0, GridUnitType.Auto) } }; corePanel.RowDefinitions = rows; + SettingRowTracker rowTracker = new SettingRowTracker(corePanel); + #region Native Settings - TextBlock nativeNotifyLabel = new() { Text = "Basic Notification" }; ; + #region Notification settings + + TextBlock nativeNotifyLabel = new() { Text = "Basic Notification" }; CheckBox nativeNotifyCheckbox = new() { IsChecked = Properties.Core.Default.NativeNotify, Content = nativeNotifyLabel }; nativeNotifyCheckbox.Checked += (object sender, RoutedEventArgs e) => @@ -159,8 +164,30 @@ namespace Observatory.UI.Views Properties.Core.Default.Save(); }; - corePanel.AddControl(nativeNotifyCheckbox, 1, 0, 2); - + corePanel.AddControl(nativeNotifyCheckbox, rowTracker.NextIndex(), 0, 2); + + #endregion + + #region System Context Priming setting + + TextBlock primeSystemContextLabel = new() { Text = "Try re-load current system information when starting monitor" }; + CheckBox primeSystemContexCheckbox = new() { IsChecked = Properties.Core.Default.TryPrimeSystemContextOnStartMonitor, Content = primeSystemContextLabel }; + + primeSystemContexCheckbox.Checked += (object sender, RoutedEventArgs e) => + { + Properties.Core.Default.TryPrimeSystemContextOnStartMonitor = true; + Properties.Core.Default.Save(); + }; + + primeSystemContexCheckbox.Unchecked += (object sender, RoutedEventArgs e) => + { + Properties.Core.Default.TryPrimeSystemContextOnStartMonitor = false; + Properties.Core.Default.Save(); + }; + + corePanel.AddControl(primeSystemContexCheckbox, rowTracker.NextIndex(), 0, 2); + + #endregion #endregion @@ -207,9 +234,10 @@ namespace Observatory.UI.Views }; - corePanel.AddControl(journalPathLabel, 2, 0); - corePanel.AddControl(journalPath, 2, 1); - corePanel.AddControl(journalBrowse, 2, 2); + int journalPathRowIndex = rowTracker.NextIndex(); + corePanel.AddControl(journalPathLabel, journalPathRowIndex, 0); + corePanel.AddControl(journalPath, journalPathRowIndex, 1); + corePanel.AddControl(journalBrowse, journalPathRowIndex, 2); #endregion @@ -249,7 +277,7 @@ namespace Observatory.UI.Views } pluginList.Items = allPlugins; - corePanel.AddControl(pluginList, 0, 0, 2); + corePanel.AddControl(pluginList, SettingRowTracker.PLUGIN_LIST_ROW_INDEX, 0, 2); #endregion @@ -451,4 +479,33 @@ namespace Observatory.UI.Views Grid.SetRow(control, row); } } + + internal class SettingRowTracker + { + public const int PLUGIN_LIST_ROW_INDEX = 0; + private int nextSettingRowIndex; + + private Grid settingPanel; + + public SettingRowTracker(Grid settingPanel) + { + this.settingPanel = settingPanel; + Reset(); + } + + public int NextIndex() + { + if (nextSettingRowIndex > settingPanel.RowDefinitions.Count) + { + throw new IndexOutOfRangeException("Trying to add more settings than rows in the settings grid."); + } + return nextSettingRowIndex++; + } + + private void Reset() + { + nextSettingRowIndex = PLUGIN_LIST_ROW_INDEX + 1; + } + + } }