nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate hard-coded field names to UserSettingsKey

Browse source
This commit is contained in:
John Lewin 2017-08-27 01:08:29 +03:00
parent 03d6743970
commit 14c387be25
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -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);
}

7
SettingsManagement/UserSettings.cs
View file

@ -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