From 8d487138ddf21eb6f84f11625a10ec0489b283d2 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 20 Jun 2016 12:56:11 -0700 Subject: [PATCH] Enabled import to Material Made "Done" button show --- SetupWizard/ImportSettingsPage.cs | 23 ++++++++++++------- .../SettingsControlSelectors.cs | 14 +++++++---- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/SetupWizard/ImportSettingsPage.cs b/SetupWizard/ImportSettingsPage.cs index 8c9e091fc..bd66f7e48 100644 --- a/SetupWizard/ImportSettingsPage.cs +++ b/SetupWizard/ImportSettingsPage.cs @@ -58,6 +58,9 @@ namespace MatterHackers.MatterControl var successMessageWidget = new WrappedTextWidget(successMessage, 10, textColor: ActiveTheme.Instance.PrimaryTextColor); container.AddChild(successMessageWidget); + + footerRow.AddChild(new HorizontalSpacer()); + footerRow.AddChild(cancelButton); } } @@ -82,6 +85,9 @@ namespace MatterHackers.MatterControl var successMessageWidget = new WrappedTextWidget(successMessage, 10, textColor: ActiveTheme.Instance.PrimaryTextColor); container.AddChild(successMessageWidget); + + footerRow.AddChild(new HorizontalSpacer()); + footerRow.AddChild(cancelButton); } } @@ -131,7 +137,7 @@ namespace MatterHackers.MatterControl // add as material preset newMaterialPresetButton = new RadioButton("Material preset".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor); - //container.AddChild(newMaterialPresetButton); + container.AddChild(newMaterialPresetButton); } else { @@ -242,12 +248,6 @@ namespace MatterHackers.MatterControl private void ImportToPreset(string settingsFilePath) { - string presetType = "Quality"; - if (newMaterialPresetButton.Checked) - { - presetType = "Material"; - } - if (!string.IsNullOrEmpty(settingsFilePath) && File.Exists(settingsFilePath)) { string importType = Path.GetExtension(settingsFilePath).ToLower(); @@ -286,7 +286,14 @@ namespace MatterHackers.MatterControl } } - ActiveSliceSettings.Instance.QualityLayers.Add(newLayer); + if (newMaterialPresetButton.Checked) + { + ActiveSliceSettings.Instance.MaterialLayers.Add(newLayer); + } + else + { + ActiveSliceSettings.Instance.QualityLayers.Add(newLayer); + } ActiveSliceSettings.Instance.SaveChanges(); } diff --git a/SlicerConfiguration/SettingsControlSelectors.cs b/SlicerConfiguration/SettingsControlSelectors.cs index 8a04a3948..7b5f494a0 100644 --- a/SlicerConfiguration/SettingsControlSelectors.cs +++ b/SlicerConfiguration/SettingsControlSelectors.cs @@ -289,17 +289,21 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (layerType == NamedSettingsLayers.Material) { settingsKey = ActiveSliceSettings.Instance.MaterialPresetKey(extruderIndex); + + ActiveSliceSettings.Instance.MaterialLayers.CollectionChanged += SettingsLayers_CollectionChanged; + dropDownList.Closed += (s1, e1) => + { + ActiveSliceSettings.Instance.MaterialLayers.CollectionChanged -= SettingsLayers_CollectionChanged; + }; } else { settingsKey = ActiveSliceSettings.Instance.ActiveQualityKey; - ActiveSliceSettings.Instance.QualityLayers.CollectionChanged += QualityLayers_CollectionChanged; - - + ActiveSliceSettings.Instance.QualityLayers.CollectionChanged += SettingsLayers_CollectionChanged; dropDownList.Closed += (s1, e1) => { - ActiveSliceSettings.Instance.QualityLayers.CollectionChanged -= QualityLayers_CollectionChanged; + ActiveSliceSettings.Instance.QualityLayers.CollectionChanged -= SettingsLayers_CollectionChanged; }; } @@ -316,7 +320,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration return dropDownList; } - private void QualityLayers_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) + private void SettingsLayers_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e) { RebuildDropDownList(); }