From 2c88fdc1fc00402d4be6c440ac4f97eacc010ddb Mon Sep 17 00:00:00 2001
From: larsbrubaker <larsbrubaker@gmail.com>
Date: Thu, 10 Apr 2014 16:38:22 -0700
Subject: [PATCH] Got the 'connect' button to do a connect after selecting a
 printer if a printer was not selected.

---
 ActionBar/PrinterActionRow.cs       | 14 +++++++++++---
 PartPreviewWindow/GcodeViewBasic.cs |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ActionBar/PrinterActionRow.cs b/ActionBar/PrinterActionRow.cs
index 7b7882cf6..70482649b 100644
--- a/ActionBar/PrinterActionRow.cs
+++ b/ActionBar/PrinterActionRow.cs
@@ -139,7 +139,7 @@ namespace MatterHackers.MatterControl.ActionBar
             {
                 if (ActivePrinterProfile.Instance.ActivePrinter == null)
                 {
-                    OpenConnectionWindow();
+                    OpenConnectionWindow(ConnectToActivePrinter);
                 }
                 else
                 {
@@ -159,12 +159,15 @@ namespace MatterHackers.MatterControl.ActionBar
             OpenConnectionWindow();
         }
 
-        void OpenConnectionWindow()
+        public delegate void ConnectOnSelectFunction();
+        ConnectOnSelectFunction functionToCallOnSelect;
+        void OpenConnectionWindow(ConnectOnSelectFunction functionToCallOnSelect = null)
         {
             if (this.connectionWindowIsOpen == false)
             {
                 connectionWindow = new ConnectionWindow();
                 this.connectionWindowIsOpen = true;
+                this.functionToCallOnSelect = functionToCallOnSelect;
                 connectionWindow.Closed += new EventHandler(ConnectionWindow_Closed);
             }
             else
@@ -188,7 +191,12 @@ namespace MatterHackers.MatterControl.ActionBar
 
         void onActivePrinterChanged(object sender, EventArgs e)
         {
-            connectPrinterButton.Enabled = true;            
+            connectPrinterButton.Enabled = true;
+            if (functionToCallOnSelect != null)
+            {
+                functionToCallOnSelect();
+                functionToCallOnSelect = null;
+            }
         }
 
         void onDisconnectButtonClick(object sender, MouseEventArgs e)
diff --git a/PartPreviewWindow/GcodeViewBasic.cs b/PartPreviewWindow/GcodeViewBasic.cs
index 16ef7a2a1..5ce14ba05 100644
--- a/PartPreviewWindow/GcodeViewBasic.cs
+++ b/PartPreviewWindow/GcodeViewBasic.cs
@@ -130,9 +130,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
             gcodeDispalyWidget = new GuiWidget(HAnchor.ParentLeftRight, Agg.UI.VAnchor.ParentBottomTop);
 
-            string startingMessage = LocalizedString.Get("No GCode Available...");
+            string startingMessage = "";
             if (printItem != null)
             {
+                startingMessage = LocalizedString.Get("No GCode Available...");
                 startingMessage = LocalizedString.Get("Loading GCode...");
                 if (Path.GetExtension(printItem.FileLocation).ToUpper() == ".GCODE")
                 {