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

Improve DI, use constructor injection

Browse source
This commit is contained in:
John Lewin 2018-07-12 09:22:28 -07:00
parent 7853d1b612
commit bbabf95c93
52 changed files with 244 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

14
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -46,15 +46,11 @@ namespace MatterHackers.MatterControl
private TextScrollWidget textScrollWidget;
private PrinterConfig printer;
public TerminalWidget(PrinterConfig printer)
public TerminalWidget(PrinterConfig printer, ThemeConfig theme)
: base(FlowDirection.TopToBottom)
{
this.printer = printer;
var theme = ApplicationController.Instance.Theme;
this.Name = "TerminalWidget";
this.BackgroundColor = theme.TabBodyBackground;
this.Padding = new BorderDouble(5, 0);
// Header
@ -67,7 +63,7 @@ namespace MatterHackers.MatterControl
filterOutput = new CheckBox("Filter Output".Localize(), textSize: theme.DefaultFontSize)
{
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.Colors.PrimaryTextColor,
VAnchor = VAnchor.Bottom,
};
filterOutput.CheckedStateChanged += (s, e) =>
@ -89,7 +85,7 @@ namespace MatterHackers.MatterControl
{
Margin = new BorderDouble(left: 25),
Checked = UserSettings.Instance.Fields.GetBool(UserSettingsKey.TerminalAutoUppercase, true),
TextColor = ActiveTheme.Instance.PrimaryTextColor,
TextColor = theme.Colors.PrimaryTextColor,
VAnchor = VAnchor.Bottom
};
autoUppercase.CheckedStateChanged += (s, e) =>
@ -105,8 +101,8 @@ namespace MatterHackers.MatterControl
textScrollWidget = new TextScrollWidget(printer, printer.Connection.TerminalLog.PrinterLines)
{
BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor,
TextColor = ActiveTheme.Instance.PrimaryTextColor,
BackgroundColor = theme.Colors.SecondaryBackgroundColor,
TextColor = theme.Colors.PrimaryTextColor,
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Stretch,
Margin = 0,