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

Consolidate ManualPrinterControls/ManualPrinterControlsDesktop

Browse source
This commit is contained in:
John Lewin 2018-01-10 22:44:45 -08:00
parent f6bbafc3a2
commit ff2adf51bc
1 changed files with 18 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

49
PrinterControls/ManualPrinterControls.cs
View file

@ -45,39 +45,11 @@ namespace MatterHackers.MatterControl
}
}
public class ManualPrinterControls : GuiWidget
public class ManualPrinterControls : ScrollableWidget
{
static public RootedObjectEventHandler AddPluginControls = new RootedObjectEventHandler();
public static RootedObjectEventHandler AddPluginControls = new RootedObjectEventHandler();
private static bool pluginsQueuedToAdd = false;
private PrinterConfig printer;
public ManualPrinterControls(PrinterConfig printer)
{
this.printer = printer;
this.BackgroundColor = ApplicationController.Instance.Theme.TabBodyBackground;
this.AnchorAll();
this.AddChild(new ManualPrinterControlsDesktop(printer));
}
public override void OnLoad(EventArgs args)
{
if (!pluginsQueuedToAdd && printer.Settings.GetValue(SettingsKey.include_firmware_updater) == "Simple Arduino")
{
UiThread.RunOnIdle(() =>
{
AddPluginControls.CallEvents(this, null);
pluginsQueuedToAdd = false;
});
pluginsQueuedToAdd = true;
}
base.OnLoad(args);
}
}
public class ManualPrinterControlsDesktop : ScrollableWidget
{
private GuiWidget fanControlsContainer;
private GuiWidget macroControlsContainer;
private GuiWidget tuningAdjustmentControlsContainer;
@ -89,7 +61,7 @@ namespace MatterHackers.MatterControl
private PrinterConfig printer;
private FlowLayoutWidget column;
public ManualPrinterControlsDesktop(PrinterConfig printer)
public ManualPrinterControls(PrinterConfig printer)
{
this.theme = ApplicationController.Instance.Theme;
@ -158,6 +130,21 @@ namespace MatterHackers.MatterControl
return sectionWidget.ContentPanel;
}
public override void OnLoad(EventArgs args)
{
if (!pluginsQueuedToAdd && printer.Settings.GetValue(SettingsKey.include_firmware_updater) == "Simple Arduino")
{
UiThread.RunOnIdle(() =>
{
AddPluginControls.CallEvents(this, null);
pluginsQueuedToAdd = false;
});
pluginsQueuedToAdd = true;
}
base.OnLoad(args);
}
public override void OnClosed(ClosedEventArgs e)
{
unregisterEvents?.Invoke(this, null);