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
ConfigurationPage/CloudSettings/CloudSettingsView.cs
View file

@ -92,7 +92,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
linkButtonFactory.fontSize = 10;
Button cloudSyncGoLink = linkButtonFactory.Generate("Go to Dashboard".Localize().ToUpper());
cloudSyncGoLink.ToolTipText = "Open cloud sync dashboard in web browser".Localize();
cloudSyncGoLink.Click += new EventHandler(cloudSyncGoButton_Click);
cloudSyncGoLink.Click += cloudSyncGoButton_Click;
cloudSyncGoLink.VAnchor = VAnchor.ParentCenter;
@ -135,7 +135,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
configureNotificationSettingsButton.Name = "Configure Notification Settings Button";
configureNotificationSettingsButton.Margin = new BorderDouble(left: 6);
configureNotificationSettingsButton.VAnchor = VAnchor.ParentCenter;
configureNotificationSettingsButton.Click += new EventHandler(configureNotificationSettingsButton_Click);
configureNotificationSettingsButton.Click += configureNotificationSettingsButton_Click;
notificationSettingsLabel = new TextWidget("Notifications".Localize());
notificationSettingsLabel.AutoExpandBoundsToText = true;

8
ConfigurationPage/PrintLeveling/PrintLevelPages.cs
View file

@ -252,8 +252,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
// set these to 0 so the button does not do any movements by default (we will handle the movement on our click callback)
zPlusControl.MoveAmount = 0;
zMinusControl.MoveAmount = 0;
zPlusControl.Click += new EventHandler(zPlusControl_Click);
zMinusControl.Click += new EventHandler(zMinusControl_Click);
zPlusControl.Click += zPlusControl_Click;
zMinusControl.Click += zMinusControl_Click;
return zButtons;
}
@ -318,8 +318,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
container.backButton.Enabled = false;
container.nextButton.Enabled = false;
zPlusControl.Click += new EventHandler(zControl_Click);
zMinusControl.Click += new EventHandler(zControl_Click);
zPlusControl.Click += zControl_Click;
zMinusControl.Click += zControl_Click;
}
protected void zControl_Click(object sender, EventArgs mouseEvent)

6
ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
View file

@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
cameraLabel.VAnchor = VAnchor.ParentCenter;
openCameraButton = textImageButtonFactory.Generate("Preview".Localize().ToUpper());
openCameraButton.Click += new EventHandler(openCameraPreview_Click);
openCameraButton.Click += openCameraPreview_Click;
openCameraButton.Margin = new BorderDouble(left: 6);
buttonRow.AddChild(cameraIcon);
@ -137,7 +137,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
openGcodeTerminalButton = textImageButtonFactory.Generate("Show Terminal".Localize().ToUpper());
openGcodeTerminalButton.Name = "Show Terminal Button";
openGcodeTerminalButton.Click += new EventHandler(openGcodeTerminalButton_Click);
openGcodeTerminalButton.Click += openGcodeTerminalButton_Click;
buttonRow.AddChild(terminalIcon);
buttonRow.AddChild(gcodeTerminalLabel);
@ -173,7 +173,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
levelingIcon.Margin = new BorderDouble(right: 6);
Button configureEePromButton = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
configureEePromButton.Click += new EventHandler(configureEePromButton_Click);
configureEePromButton.Click += configureEePromButton_Click;
//buttonRow.AddChild(eePromIcon);
buttonRow.AddChild(notificationSettingsLabel);