From 9153bbb7caa322d0d4db1297e48e3b1a47ee6c17 Mon Sep 17 00:00:00 2001
From: Kevin Pope <kevin.pope@matterhackers.com>
Date: Tue, 11 Feb 2014 11:59:43 -0800
Subject: [PATCH] Added separate button with help text for 'Cancel Connection'.
 Fixed duplicate method within PrintLevelWizard.

---
 ActionBar/PrintActionRow.cs | 11 ++++++++++-
 PrintLevelWizard.cs         |  4 ----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ActionBar/PrintActionRow.cs b/ActionBar/PrintActionRow.cs
index 7f441e517..acccc1b83 100644
--- a/ActionBar/PrintActionRow.cs
+++ b/ActionBar/PrintActionRow.cs
@@ -25,6 +25,8 @@ namespace MatterHackers.MatterControl.ActionBar
         List<TooltipButton> activePrintButtons = new List<TooltipButton>();
         List<TooltipButton> allPrintButtons = new List<TooltipButton>();
 
+        TooltipButton cancelConnectButton;
+
         TooltipButton addButton;
         
         TooltipButton startButton;
@@ -72,6 +74,10 @@ namespace MatterHackers.MatterControl.ActionBar
 			string pauseButtonMessage = new LocalizedString("Pause the current print").Translated;
 			pauseButton = makeButton(pauseButtonTxt, pauseButtonMessage);
 
+            string cancelCancelButtonTxt = new LocalizedString("Cancel Connect").Translated;
+            string cancelConnectButtonMessage = new LocalizedString("Stop trying to connect to the printer.").Translated;
+            cancelConnectButton = makeButton(cancelCancelButtonTxt, cancelConnectButtonMessage);
+
 			string cancelButtonTxt = new LocalizedString("Cancel").Translated;
 			string cancelButtonMessage = new LocalizedString("Stop the current print").Translated;
 			cancelButton = makeButton(cancelButtonTxt, cancelButtonMessage);
@@ -109,6 +115,9 @@ namespace MatterHackers.MatterControl.ActionBar
             this.AddChild(cancelButton);
             allPrintButtons.Add(cancelButton);
 
+            this.AddChild(cancelConnectButton);
+            allPrintButtons.Add(cancelConnectButton);
+
             this.AddChild(reprintButton);
             allPrintButtons.Add(reprintButton);
 
@@ -389,7 +398,7 @@ namespace MatterHackers.MatterControl.ActionBar
                 switch (PrinterCommunication.Instance.CommunicationState)
                 {
                     case PrinterCommunication.CommunicationStates.AttemptingToConnect:
-                        this.activePrintButtons.Add(cancelButton);
+                        this.activePrintButtons.Add(cancelConnectButton);
                         EnableActiveButtons();
                         break;
 
diff --git a/PrintLevelWizard.cs b/PrintLevelWizard.cs
index e365350e7..18bf6924d 100644
--- a/PrintLevelWizard.cs
+++ b/PrintLevelWizard.cs
@@ -389,10 +389,6 @@ namespace MatterHackers.MatterControl
 		{
 			UiThread.RunOnIdle (DoDoneButton_Click);
 		}
-		void DoDoneButton_Click(object state)
-        {
-            UiThread.RunOnIdle(DoDoneButton_Click);
-        }
 
         void DoDoneButton_Click(object state)
         {