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

2
PrinterControls/PrinterConnections/ConnectionWizardPage.cs
View file

@ -12,7 +12,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
public ConnectionWizardPage() : base("Cancel")
{
cancelButton.Click += (s, e) => PrinterConnectionAndCommunication.Instance.HaltConnectionThread();
closeButton.Click += (s, e) => PrinterConnectionAndCommunication.Instance.HaltConnectionThread();
}
}
}

2
PrinterControls/PrinterConnections/SetupStepBaudRate.cs
View file

@ -31,7 +31,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
//Add buttons to buttonContainer
footerRow.AddChild(nextButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
}
BindBaudRateHandlers();
}

2
PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -50,7 +50,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
footerRow.AddChild(connectButton);
footerRow.AddChild(refreshButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
}

2
PrinterControls/PrinterConnections/SetupStepComPortOne.cs
View file

@ -22,7 +22,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
//Add buttons to buttonContainer
footerRow.AddChild(nextButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
}
}

2
PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
footerRow.AddChild(nextButton);
footerRow.AddChild(connectButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
}
}

2
PrinterControls/PrinterConnections/SetupStepInstallDriver.cs
View file

@ -49,7 +49,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
footerRow.AddChild(installButton);
footerRow.AddChild(skipButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
}
}

2
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -109,7 +109,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
//Add buttons to buttonContainer
footerRow.AddChild(nextButton);
footerRow.AddChild(new HorizontalSpacer());
footerRow.AddChild(cancelButton);
footerRow.AddChild(closeButton);
usingDefaultName = true;