From 14c387be259a65dcffecad60d6c9ffbbf7b15b19 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sun, 27 Aug 2017 01:08:29 +0300 Subject: [PATCH] Migrate hard-coded field names to UserSettingsKey --- PrinterControls/TerminalWindow/TerminalWidget.cs | 13 +++++-------- SettingsManagement/UserSettings.cs | 7 ++++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/PrinterControls/TerminalWindow/TerminalWidget.cs b/PrinterControls/TerminalWindow/TerminalWidget.cs index 5b01f326d..5b71ca6c1 100644 --- a/PrinterControls/TerminalWindow/TerminalWidget.cs +++ b/PrinterControls/TerminalWindow/TerminalWidget.cs @@ -45,10 +45,7 @@ namespace MatterHackers.MatterControl private CheckBox autoUppercase; private MHTextEditWidget manualCommandTextEdit; private TextScrollWidget textScrollWidget; - - private static readonly string TerminalFilterOutputKey = "TerminalFilterOutput"; - private static readonly string TerminalAutoUppercaseKey = "TerminalAutoUppercase"; - + public TerminalWidget() : base(FlowDirection.TopToBottom) { @@ -82,20 +79,20 @@ namespace MatterHackers.MatterControl textScrollWidget.SetLineStartFilter(null); } - UserSettings.Instance.Fields.SetBool(TerminalFilterOutputKey, filterOutput.Checked); + UserSettings.Instance.Fields.SetBool(UserSettingsKey.TerminalFilterOutput, filterOutput.Checked); }; headerRow.AddChild(filterOutput); autoUppercase = new CheckBox("Auto Uppercase".Localize()) { Margin = new BorderDouble(left: 25), - Checked = UserSettings.Instance.Fields.GetBool(TerminalAutoUppercaseKey, true), + Checked = UserSettings.Instance.Fields.GetBool(UserSettingsKey.TerminalAutoUppercase, true), TextColor = ActiveTheme.Instance.PrimaryTextColor, VAnchor = VAnchor.Bottom }; autoUppercase.CheckedStateChanged += (s, e) => { - UserSettings.Instance.Fields.SetBool(TerminalAutoUppercaseKey, autoUppercase.Checked); + UserSettings.Instance.Fields.SetBool(UserSettingsKey.TerminalAutoUppercase, autoUppercase.Checked); }; headerRow.AddChild(autoUppercase); @@ -249,7 +246,7 @@ namespace MatterHackers.MatterControl #if !__ANDROID__ public override void OnLoad(EventArgs args) { - filterOutput.Checked = UserSettings.Instance.Fields.GetBool(TerminalFilterOutputKey, false); + filterOutput.Checked = UserSettings.Instance.Fields.GetBool(UserSettingsKey.TerminalFilterOutput, false); UiThread.RunOnIdle(manualCommandTextEdit.Focus); base.OnLoad(args); } diff --git a/SettingsManagement/UserSettings.cs b/SettingsManagement/UserSettings.cs index 968c123b8..b934be38e 100644 --- a/SettingsManagement/UserSettings.cs +++ b/SettingsManagement/UserSettings.cs @@ -1,7 +1,6 @@ -using MatterHackers.MatterControl.DataStorage; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using MatterHackers.Agg.UI; +using MatterHackers.MatterControl.DataStorage; namespace MatterHackers.MatterControl { @@ -16,6 +15,8 @@ namespace MatterHackers.MatterControl public const string CredentialsInvalidReason = nameof(CredentialsInvalidReason); public const string SliceSettingsLevel = nameof(SliceSettingsLevel); public const string SliceSettingsShowHelp = nameof(SliceSettingsShowHelp); + public const string TerminalFilterOutput = nameof(TerminalFilterOutput); + public const string TerminalAutoUppercase = nameof(TerminalAutoUppercase); } public class UserSettings