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

Remove duplicate .Click event from ButtonBase

Browse source
This commit is contained in:
John Lewin 2017-01-17 14:47:04 -08:00
parent ca7130fa96
commit 8510ca5b3d
31 changed files with 64 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CustomWidgets/EditableNumberDisplay.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl
valueDisplay.TextColor = ActiveTheme.Instance.PrimaryTextColor;
valueDisplay.Margin = new BorderDouble(6);
clickableValueContainer.Click += new EventHandler(editField_Click);
clickableValueContainer.Click += editField_Click;
clickableValueContainer.AddChild(valueDisplay);
clickableValueContainer.SetBoundsToEncloseChildren();
@ -78,7 +78,7 @@ namespace MatterHackers.MatterControl
}
};
setButton.Click += new EventHandler(setButton_Click);
setButton.Click += setButton_Click;
this.AddChild(clickableValueContainer);
this.AddChild(numberInputField);

10
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -98,7 +98,7 @@ namespace MatterHackers.MatterControl
Button exportAsStlButton = textImageButtonFactory.Generate(exportStlTextFull);
exportAsStlButton.HAnchor = HAnchor.ParentLeft;
exportAsStlButton.Cursor = Cursors.Hand;
exportAsStlButton.Click += new EventHandler(exportSTL_Click);
exportAsStlButton.Click += exportSTL_Click;
middleRowContainer.AddChild(exportAsStlButton);
}
@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl
Button exportAsAmfButton = textImageButtonFactory.Generate(exportAmfTextFull);
exportAsAmfButton.HAnchor = HAnchor.ParentLeft;
exportAsAmfButton.Cursor = Cursors.Hand;
exportAsAmfButton.Click += new EventHandler(exportAMF_Click);
exportAsAmfButton.Click += exportAMF_Click;
middleRowContainer.AddChild(exportAsAmfButton);
}
@ -122,10 +122,10 @@ namespace MatterHackers.MatterControl
exportGCode.Name = "Export as GCode Button";
exportGCode.HAnchor = HAnchor.ParentLeft;
exportGCode.Cursor = Cursors.Hand;
exportGCode.Click += new EventHandler((object sender, EventArgs e) =>
exportGCode.Click += (s, e) =>
{
UiThread.RunOnIdle(ExportGCode_Click);
});
};
middleRowContainer.AddChild(exportGCode);
PluginFinder<ExportGcodePlugin> exportPluginFinder = new PluginFinder<ExportGcodePlugin>();
@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl
Button exportButton = textImageButtonFactory.Generate(exportButtonText);
exportButton.HAnchor = HAnchor.ParentLeft;
exportButton.Cursor = Cursors.Hand;
exportButton.Click += (object sender, EventArgs e) =>
exportButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>
{

4
CustomWidgets/WizardControl.cs
View file

@ -107,11 +107,11 @@ namespace MatterHackers.MatterControl
buttonBar.Padding = new BorderDouble(0, 3);
backButton = textImageButtonFactory.Generate("Back".Localize(), centerText: true);
backButton.Click += new EventHandler(back_Click);
backButton.Click += back_Click;
nextButton = textImageButtonFactory.Generate("Next".Localize(), centerText: true);
nextButton.Name = "Next Button";
nextButton.Click += new EventHandler(next_Click);
nextButton.Click += next_Click;
doneButton = textImageButtonFactory.Generate("Done".Localize(), centerText: true);
doneButton.Name = "Done Button";