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

Latest submodules

Browse source
This commit is contained in:
John Lewin 2019-04-01 16:35:44 -07:00
parent f47942dd05
commit 194e1c7e81
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/ActionBar/TemperatureWidgetExtruder.cs
View file

@ -65,12 +65,12 @@ namespace MatterHackers.MatterControl.ActionBar
var loadButton = theme.CreateDialogButton("Load".Localize());
loadButton.ToolTipText = "Load filament".Localize();
loadButton.Name = "Load Filament Button";
loadButton.Click += (s, e) =>UiThread.RunOnIdle(() =>
loadButton.Click += (s, e) => UiThread.RunOnIdle(() =>
{
DialogWindow.Show(
new LoadFilamentWizard(printer, extruderIndex, showAlreadyLoadedButton: false));
});
loadUnloadButtonRow.AddChild(loadButton);
var unloadButton = theme.CreateDialogButton("Unload".Localize());
@ -211,6 +211,7 @@ namespace MatterHackers.MatterControl.ActionBar
}
protected override int ActualTemperature => (int)printer.Connection.GetActualHotendTemperature(this.hotendIndex);
protected override int TargetTemperature => (int)printer.Connection.GetTargetHotendTemperature(this.hotendIndex);
private string TemperatureKey
@ -237,6 +238,7 @@ namespace MatterHackers.MatterControl.ActionBar
widget.AddChild(container);
GuiWidget hotendRow;
container.AddChild(hotendRow = new SettingsItem(
printer.Settings.Helpers.NumberOfHotends() == 1 ? "Hotend".Localize() : "Hotend {0}".Localize().FormatWith(hotendIndex + 1),
menuTheme,
@ -259,7 +261,7 @@ namespace MatterHackers.MatterControl.ActionBar
},
enforceGutter: false));
var toggleWidget = hotendRow.Children.Where(o => o is ICheckbox).FirstOrDefault();
var toggleWidget = hotendRow.Children.FirstOrDefault(o => o is ICheckbox);
toggleWidget.Name = "Toggle Heater";
heatToggle = toggleWidget as ICheckbox;