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

Load and Unload Macros working better.

Browse source 
Fixed colors on redeem purchase disabled button
This commit is contained in:
Lars Brubaker 2016-11-29 14:17:37 -08:00
parent a241888635
commit 06b1512698
24 changed files with 87 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ConfigurationPage/RunningMacroPage.cs
View file

@ -43,35 +43,40 @@ namespace MatterHackers.MatterControl.PrinterControls
{
public class RunningMacroPage : WizardPage
{
public static void Show(string message, bool showOkButton = false)
public static void Show(string message, bool showOkButton = false, bool showMaterialSelector = false)
{
WizardWindow.Show("Macro", "Running Macro", new RunningMacroPage(message, showOkButton));
WizardWindow.Show("Macro", "Running Macro", new RunningMacroPage(message, showOkButton, showMaterialSelector));
}
public RunningMacroPage(string message, bool showOkButton)
: base("Cancel", "Macro Feedback")
public RunningMacroPage(string message, bool showOkButton, bool showMaterialSelector)
: base("Close", "Macro Feedback")
{
TextWidget syncingText = new TextWidget(message, textColor: ActiveTheme.Instance.PrimaryTextColor);
contentRow.AddChild(syncingText);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
if(showMaterialSelector)
{
int extruderIndex = 0;
contentRow.AddChild(new PresetSelectorWidget(string.Format($"{"Material".Localize()} {extruderIndex + 1}"), RGBA_Bytes.Orange, NamedSettingsLayers.Material, extruderIndex));
}
if(showOkButton)
{
Button okButton = textImageButtonFactory.Generate("OK".Localize());
okButton.Margin = new BorderDouble(5);
Button okButton = textImageButtonFactory.Generate("Continue".Localize());
okButton.Margin = new BorderDouble(0,0,0,25);
okButton.HAnchor = HAnchor.ParentCenter;
okButton.Click += (s, e) => PrinterConnectionAndCommunication.Instance.MacroContinue();
okButton.Click += (s, e) =>
{
PrinterConnectionAndCommunication.Instance.MacroContinue();
UiThread.RunOnIdle(() => WizardWindow?.Close());
};
contentRow.AddChild(okButton);
}
cancelButton.Click += (s, e) =>
{
PrinterConnectionAndCommunication.Instance.MacroCancel();
};
}
public override void OnClosed(EventArgs e)