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

Moved the silcer selection to config.

Browse source
This commit is contained in:
larsbrubaker 2014-11-11 14:51:36 -08:00
parent 00f7477bad
commit 957d7bb6f3
4 changed files with 139 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

45
ConfigurationPage/ApplicationSettings/ApplicationSettingsView.cs
View file

@ -12,6 +12,7 @@ using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.EeProm;
using MatterHackers.VectorMath;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.ConfigurationPage
{
@ -29,6 +30,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
mainContainer.AddChild(GetLanguageControl());
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
GuiWidget sliceEngineControl = GetSliceEngineControl();
if (sliceEngineControl != null)
{
mainContainer.AddChild(sliceEngineControl);
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
}
//Disabled for now (KP)
//mainContainer.AddChild(GetDisplayControl());
@ -296,6 +303,44 @@ namespace MatterHackers.MatterControl.ConfigurationPage
return buttonRow;
}
private FlowLayoutWidget GetSliceEngineControl()
{
FlowLayoutWidget buttonRow = new FlowLayoutWidget();
buttonRow.HAnchor = HAnchor.ParentLeftRight;
buttonRow.Margin = new BorderDouble(top: 4);
TextWidget settingsLabel = new TextWidget("Slice Engine".Localize());
settingsLabel.AutoExpandBoundsToText = true;
settingsLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor;
settingsLabel.VAnchor = VAnchor.ParentTop;
FlowLayoutWidget controlsContainer = new FlowLayoutWidget();
controlsContainer.HAnchor = HAnchor.ParentLeftRight;
FlowLayoutWidget optionsContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
optionsContainer.Margin = new BorderDouble(bottom: 6);
if (ActiveSliceSettings.Instance.ExtruderCount > 1)
{
// Reset active slicer to MatterSlice when multi-extruder is detected and MatterSlice is not already set
if (ActivePrinterProfile.Instance.ActiveSliceEngineType != ActivePrinterProfile.SlicingEngineTypes.MatterSlice)
{
ActivePrinterProfile.Instance.ActiveSliceEngineType = ActivePrinterProfile.SlicingEngineTypes.MatterSlice;
}
// don't let the silce engine change if dual extrusion
return null;
}
optionsContainer.AddChild(new SliceEngineSelector("Slice Engine".Localize()));
optionsContainer.Width = 200;
buttonRow.AddChild(settingsLabel);
buttonRow.AddChild(new HorizontalSpacer());
buttonRow.AddChild(optionsContainer);
return buttonRow;
}
private void AddHandlers()
{
}

1
ConfigurationPage/LanguageSelector.cs
View file

@ -60,7 +60,6 @@ namespace MatterHackers.MatterControl
languageDict["Deutsch"] = "DE";
languageDict["Polski"] = "PL";
languageDict["Türkçe"] = "TR";
}
}
}