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

Remove redundant event, use SettingChanged

Browse source
This commit is contained in:
jlewin 2019-03-06 07:24:26 -08:00
parent 41801cd07b
commit 2bb8f23611
2 changed files with 10 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

22
MatterControlLib/SlicerConfiguration/PresetSelectorWidget.cs
View file

@ -87,7 +87,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.AddChild(pullDownContainer);
// Register listeners
printer.Settings.MaterialPresetChanged += ActiveSliceSettings_MaterialPresetChanged;
printer.Settings.SettingChanged += Printer_SettingChanged;
}
@ -126,21 +125,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var presetsContext = new PresetsContext(printer.Settings.MaterialLayers, layerToEdit)
{
LayerType = NamedSettingsLayers.Material,
SetAsActive = (materialKey) =>
{
printer.Settings.ActiveMaterialKey = materialKey;
},
SetAsActive = (materialKey) => printer.Settings.ActiveMaterialKey = materialKey,
DeleteLayer = () =>
{
var materialKeys = printer.Settings.MaterialSettingsKeys;
for (var i = 0; i < materialKeys.Count; i++)
{
if (materialKeys[i] == presetsID)
{
materialKeys[i] = "";
}
}
printer.Settings.ActiveMaterialKey = "";
printer.Settings.MaterialLayers.Remove(layerToEdit);
printer.Settings.Save();
@ -220,7 +207,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public override void OnClosed(EventArgs e)
{
// Unregister listeners
printer.Settings.MaterialPresetChanged -= ActiveSliceSettings_MaterialPresetChanged;
printer.Settings.SettingChanged -= Printer_SettingChanged;
base.OnClosed(e);
@ -230,17 +216,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
if (stringEvent != null
&& (stringEvent.Data == SettingsKey.default_material_presets
|| stringEvent.Data == SettingsKey.active_material_key
|| stringEvent.Data == SettingsKey.layer_name))
{
RebuildDropDownList();
}
}
private void ActiveSliceSettings_MaterialPresetChanged(object sender, EventArgs e)
{
RebuildDropDownList();
}
private DropDownList CreateDropdown()
{
var dropDownList = new MHDropDownList(defaultMenuItemText, theme, maxHeight: 300, useLeftIcons: true)