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

Writing more code to make it work

Browse source 
starting on some untility proof of concept by writing macros for load unload filament.
This commit is contained in:
Lars Brubaker 2016-11-04 12:04:49 -07:00
parent 7232620360
commit df1602e9aa
3 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/EditMacrosWindow.cs
View file

@ -163,7 +163,7 @@ namespace MatterHackers.MatterControl
macroCommandLabel.HAnchor = HAnchor.ParentLeftRight;
macroCommandLabel.Margin = new BorderDouble(0, 0, 0, 1);
macroCommandInput = new MHTextEditWidget(windowController.ActiveMacro.GCode, pixelHeight: 120, multiLine: true);
macroCommandInput = new MHTextEditWidget(windowController.ActiveMacro.GCode, pixelHeight: 120, multiLine: true, typeFace: ApplicationController.MonoSpacedTypeFace);
macroCommandInput.HAnchor = HAnchor.ParentLeftRight;
macroCommandInput.VAnchor = VAnchor.ParentBottomTop;
macroCommandInput.ActualTextEditWidget.VAnchor = VAnchor.ParentBottomTop;

24
PrinterControls/TerminalWindow/TerminalWidget.cs
View file

@ -75,11 +75,12 @@ namespace MatterHackers.MatterControl
topBarControls.HAnchor |= HAnchor.ParentLeft;
{
string filterOutputChkTxt = LocalizedString.Get("Filter Output");
filterOutput = new CheckBox(filterOutputChkTxt);
filterOutput.Margin = new BorderDouble(5, 5, 5, 2);
filterOutput.TextColor = this.textColor;
filterOutput = new CheckBox("Filter Output".Localize())
{
Margin = new BorderDouble(5, 5, 5, 2),
TextColor = this.textColor,
VAnchor = Agg.UI.VAnchor.ParentBottom,
};
filterOutput.CheckedStateChanged += (object sender, EventArgs e) =>
{
if (filterOutput.Checked)
@ -94,14 +95,11 @@ namespace MatterHackers.MatterControl
UserSettings.Instance.Fields.SetBool(TerminalFilterOutputKey, filterOutput.Checked);
};
filterOutput.VAnchor = Agg.UI.VAnchor.ParentBottom;
topBarControls.AddChild(filterOutput);
}
{
string autoUpperCaseChkTxt = LocalizedString.Get("Auto Uppercase");
autoUppercase = new CheckBox(autoUpperCaseChkTxt);
autoUppercase = new CheckBox("Auto Uppercase".Localize());
autoUppercase.Margin = new BorderDouble(5, 5, 5, 2);
autoUppercase.Checked = UserSettings.Instance.Fields.GetBool(TerminalAutoUppercaseKey, true);
autoUppercase.TextColor = this.textColor;
@ -153,7 +151,7 @@ namespace MatterHackers.MatterControl
manualEntryTopToBottomLayout.AddChild(manualEntryLayout);
Button clearConsoleButton = controlButtonFactory.Generate(LocalizedString.Get("Clear"));
Button clearConsoleButton = controlButtonFactory.Generate("Clear".Localize());
clearConsoleButton.Margin = new BorderDouble(0);
clearConsoleButton.Click += (sender, e) =>
{
@ -161,19 +159,19 @@ namespace MatterHackers.MatterControl
};
//Output Console text to screen
Button exportConsoleTextButton = controlButtonFactory.Generate(LocalizedString.Get("Export..."));
Button exportConsoleTextButton = controlButtonFactory.Generate("Export...".Localize());
exportConsoleTextButton.Click += (sender, mouseEvent) =>
{
UiThread.RunOnIdle(DoExportExportLog_Click);
};
Button closeButton = controlButtonFactory.Generate(LocalizedString.Get("Close"));
Button closeButton = controlButtonFactory.Generate("Close".Localize());
closeButton.Click += (sender, e) =>
{
UiThread.RunOnIdle(CloseWindow);
};
sendCommand = controlButtonFactory.Generate(LocalizedString.Get("Send"));
sendCommand = controlButtonFactory.Generate("Send".Localize());
sendCommand.Click += new EventHandler(sendManualCommandToPrinter_Click);
FlowLayoutWidget bottomRowContainer = new FlowLayoutWidget();