Merge remote-tracking branch 'Greg's_Fork/master' into development

This commit is contained in:
larsbrubaker 2014-02-24 14:51:43 -08:00
commit 0d81deb380
2 changed files with 12 additions and 6 deletions

View file

@ -80,10 +80,13 @@ namespace MatterHackers.MatterControl
if(showExportGCodeButton)
{
Button exportGCode = textImageButtonFactory.Generate(new LocalizedString("Export as GCode").Translated);
string exportGCodeTxt = new LocalizedString ("Export as").Translated;
string exportGCodeTxtFull = string.Format ("{0} GCode", exportGCodeTxt);
Button exportGCode = textImageButtonFactory.Generate(exportGCodeTxtFull);
//exportGCode.HAnchor = Agg.UI.HAnchor.ParentCenter;
exportGCode.Click += new ButtonBase.ButtonEventHandler(exportGCode_Click);
topToBottom.AddChild(exportGCode);
exportGCode.Click += new ButtonBase.ButtonEventHandler(exportGCode_Click);
topToBottom.AddChild(exportGCode);
}
GuiWidget vSpacer = new GuiWidget();

View file

@ -80,10 +80,13 @@ namespace MatterHackers.MatterControl.PrintLibrary
if (showExportGCodeButton)
{
Button exportGCode = textImageButtonFactory.Generate(new LocalizedString("Export as GCode").Translated);
string exportGCodeTxt = new LocalizedString ("Export as").Translated;
string exportGCodeTxtFull = string.Format ("{0} GCode", exportGCodeTxt);
Button exportGCode = textImageButtonFactory.Generate(exportGCodeTxtFull);
//exportGCode.HAnchor = Agg.UI.HAnchor.ParentCenter;
exportGCode.Click += new ButtonBase.ButtonEventHandler(exportGCode_Click);
topToBottom.AddChild(exportGCode);
exportGCode.Click += new ButtonBase.ButtonEventHandler(exportGCode_Click);
topToBottom.AddChild(exportGCode);
}
GuiWidget vSpacer = new GuiWidget();