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

Merge branch '1.4.0' of https://github.com/MatterHackers/MatterControl into 1.4.0

Browse source
This commit is contained in:
Lars Brubaker 2015-09-21 15:44:23 -07:00
commit 712ee8fd2c
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Library/LibraryRowItem.cs
View file

@ -39,6 +39,8 @@ namespace MatterHackers.MatterControl.PrintLibrary
{
public abstract class LibraryRowItem : GuiWidget
{
public static readonly string LoadingPlaceholderToken = "!Placeholder_ItemToken!";
public bool IsSelectedItem
{
get

8
Library/LibraryRowItemCollection.cs
View file

@ -64,6 +64,12 @@ namespace MatterHackers.MatterControl.PrintLibrary
this.Name = this.ItemName + " Row Item Collection";
if (collection.Key == LibraryRowItem.LoadingPlaceholderToken)
{
this.EnableSlideInActions = false;
this.IsViewHelperItem = true;
}
CreateGuiElements();
}
@ -170,7 +176,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
public override void OnMouseDown(MouseEventArgs mouseEvent)
{
if (mouseEvent.Clicks == 2)
if (mouseEvent.Clicks == 2 && this.EnableSlideInActions)
{
UiThread.RunOnIdle(ChangeCollection);
}

2
Library/LibraryRowItemPart.cs
View file

@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
}
this.ItemName = libraryProvider.GetPrintItemName(itemIndex);
if(this.ItemName.IndexOf("!ProviderIsLoading!") != -1)
if(this.ItemName == LibraryRowItem.LoadingPlaceholderToken)
{
this.ItemName = "Retrieving Contents...".Localize();
this.IsViewHelperItem = true;

4
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -218,7 +218,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (materialTemperature != "0")
{
string setTempString = "M109 T{0} S{1}".FormatWith(extruderIndex0Based, materialTemperature);
AddDefaultIfNotPresent(preStartGCode, setTempString, preStartGCodeLines, string.Format("wait for extruder {0}", extruderIndex0Based));
AddDefaultIfNotPresent(preStartGCode, setTempString, preStartGCodeLines, string.Format("wait for extruder {0}", extruderIndex0Based + 1));
}
}
}
@ -270,7 +270,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
if (materialTemperature != "0")
{
string setTempString = "M109 T{0} S{1}".FormatWith(extruderIndex0Based, materialTemperature);
AddDefaultIfNotPresent(postStartGCode, setTempString, postStartGCodeLines, string.Format("wait for extruder {0} to reach temperature", extruderIndex0Based));
AddDefaultIfNotPresent(postStartGCode, setTempString, postStartGCodeLines, string.Format("wait for extruder {0} to reach temperature", extruderIndex0Based + 1));
}
}
}