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

Merge remote-tracking branch 'lars/master'

Browse source
This commit is contained in:
Lars Brubaker 2016-05-09 16:55:47 -07:00
commit 6c321583f8
111 changed files with 71 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SlicerConfiguration/SettingsControlSelectors.cs
View file

@ -97,7 +97,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
editButton.Click += (sender, e) =>
{
if (layerType == NamedSettingsLayers.Material)
{
{
if (ApplicationController.Instance.EditMaterialPresetsWindow == null)
{
string presetsKey = ActiveSliceSettings.Instance.MaterialPresetKey(extruderIndex);
@ -187,7 +187,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
menuItem.Selected += MenuItem_Selected;
}
MenuItem addNewPreset = dropDownList.AddItem(InvertLightness.DoInvertLightness(StaticData.Instance.LoadIcon("icon_circle_plus.png")), "Add New Setting...", "new");
MenuItem addNewPreset = dropDownList.AddItem(StaticData.Instance.LoadIcon("icon_plus.png", 32, 32), "Add New Setting...", "new");
addNewPreset.Selected += (s, e) =>
{
var newLayer = ActiveSliceSettings.Instance.CreatePresetsLayer(layerType);
@ -210,7 +210,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
parent.AddChild(this.dropDownList);
editButton.ClickButton(new MouseEventArgs(MouseButtons.Left, 1, 0, 0, 0));
};
};
try
{