Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
larsbrubaker 2014-04-15 18:13:32 -07:00
commit a511bbddbe
2 changed files with 6 additions and 2 deletions

View file

@ -119,7 +119,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gcodeDispalyWidget = new GuiWidget(HAnchor.ParentLeftRight, Agg.UI.VAnchor.ParentBottomTop);
string startingMessage = "";
string startingMessage = "Press 'Add' to select an item.";
if (printItem != null)
{
startingMessage = LocalizedString.Get("No GCode Available...");
@ -159,6 +159,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
}
else
{
generateGCodeButton.Visible = false;
}
centerPartPreviewAndControls.AddChild(gcodeDispalyWidget);