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

Changed ButtonEventHandler to EventHandler

Browse source 
Made lock disable the selection widget but be more inteligent about re-enabling it after unlock
This commit is contained in:
larsbrubaker 2014-10-24 13:41:13 -07:00
parent e3ba5f3ea7
commit 222a5a46a7
49 changed files with 343 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
View file

@ -117,12 +117,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage
enablePrintLevelingButton = textImageButtonFactory.Generate("Enable".Localize().ToUpper());
enablePrintLevelingButton.Margin = new BorderDouble(left:6);
enablePrintLevelingButton.VAnchor = VAnchor.ParentCenter;
enablePrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(enablePrintLeveling_Click);
enablePrintLevelingButton.Click += new EventHandler(enablePrintLeveling_Click);
disablePrintLevelingButton = textImageButtonFactory.Generate("Disable".Localize().ToUpper());
disablePrintLevelingButton.Margin = new BorderDouble(left:6);
disablePrintLevelingButton.VAnchor = VAnchor.ParentCenter;
disablePrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(disablePrintLeveling_Click);
disablePrintLevelingButton.Click += new EventHandler(disablePrintLeveling_Click);
printLevelingStatusLabel = new TextWidget ("");
printLevelingStatusLabel.AutoExpandBoundsToText = true;
@ -161,7 +161,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
gcodeTerminalLabel.VAnchor = VAnchor.ParentCenter;
openGcodeTerminalButton = textImageButtonFactory.Generate("Show Terminal".Localize().ToUpper());
openGcodeTerminalButton.Click += new ButtonBase.ButtonEventHandler(openGcodeTerminalButton_Click);
openGcodeTerminalButton.Click += new EventHandler(openGcodeTerminalButton_Click);
buttonRow.AddChild(gcodeTerminalLabel);
buttonRow.AddChild(new HorizontalSpacer());
@ -211,13 +211,13 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void AddHandlers()
{
configureAutoLevelButton.Click += new ButtonBase.ButtonEventHandler(configureAutoLevelButton_Click);
configureEePromButton.Click += new ButtonBase.ButtonEventHandler(configureEePromButton_Click);
configureAutoLevelButton.Click += new EventHandler(configureAutoLevelButton_Click);
configureEePromButton.Click += new EventHandler(configureEePromButton_Click);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
}
void configureEePromButton_Click(object sender, MouseEventArgs mouseEvent)
void configureEePromButton_Click(object sender, EventArgs mouseEvent)
{
UiThread.RunOnIdle((state) =>
{
@ -264,7 +264,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
});
}
void configureAutoLevelButton_Click(object sender, MouseEventArgs mouseEvent)
void configureAutoLevelButton_Click(object sender, EventArgs mouseEvent)
{
UiThread.RunOnIdle((state) =>
{
@ -272,7 +272,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
});
}
void openGcodeTerminalButton_Click(object sender, MouseEventArgs mouseEvent)
void openGcodeTerminalButton_Click(object sender, EventArgs mouseEvent)
{
UiThread.RunOnIdle((state) =>
@ -288,12 +288,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage
this.Invalidate();
}
void enablePrintLeveling_Click(object sender, MouseEventArgs mouseEvent)
void enablePrintLeveling_Click(object sender, EventArgs mouseEvent)
{
ActivePrinterProfile.Instance.DoPrintLeveling = true;
}
void disablePrintLeveling_Click(object sender, MouseEventArgs mouseEvent)
void disablePrintLeveling_Click(object sender, EventArgs mouseEvent)
{
ActivePrinterProfile.Instance.DoPrintLeveling = false;
}