nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	PartPreviewWindow/View3DTransfromPart.cs
This commit is contained in:
larsbrubaker 2014-10-13 12:27:31 -07:00
commit 196c3e1c76
8 changed files with 97 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrintQueue/OptionsMenu/QueueOptionsMenu.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.PrintQueue
void SetMenuItems()
{
menuItems = new TupleList<string, Func<bool>>();
menuItems.Add(new Tuple<string,Func<bool>>("Design", null));
menuItems.Add(new Tuple<string,Func<bool>>(LocalizedString.Get("Design"), null));
menuItems.Add(new Tuple<string,Func<bool>>(LocalizedString.Get(" Import from Zip"), importQueueFromZipMenu_Click));
menuItems.Add(new Tuple<string,Func<bool>>(LocalizedString.Get(" Export to Zip"), exportQueueToZipMenu_Click));
menuItems.Add(new Tuple<string,Func<bool>>("GCode", null));