From cbdbe953370083d6795b36970937896b93ec8472 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 31 Dec 2020 13:08:37 -0800 Subject: [PATCH] Removing expand settings menu item --- .../SliceSettingsWidget.cs | 35 ------------------- .../HardwareLevelingUITests.cs | 4 +-- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index afa55c3fb..2d9161d31 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -345,29 +345,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration this.PerformLayout(); } - public enum ExpansionMode - { - Expanded, - Collapsed - } - - public void ForceExpansionMode(ExpansionMode expansionMode) - { - bool firstItem = true; - foreach (var sectionWidget in this.ActiveTab.TabContent.Descendants().Reverse()) - { - if (firstItem) - { - sectionWidget.Checkbox.Checked = true; - firstItem = false; - } - else - { - sectionWidget.Checkbox.Checked = expansionMode == ExpansionMode.Expanded; - } - } - } - private void ExtendOverflowMenu(PopupMenu popupMenu) { var menu = popupMenu.CreateMenuItem("View Just My Settings".Localize()); @@ -388,18 +365,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } }; - popupMenu.CreateSeparator(); - - popupMenu.CreateMenuItem("Expand All".Localize()).Click += (s, e) => - { - this.ForceExpansionMode(ExpansionMode.Expanded); - }; - - popupMenu.CreateMenuItem("Collapse All".Localize()).Click += (s, e) => - { - this.ForceExpansionMode(ExpansionMode.Collapsed); - }; - if (settingsContext.ViewFilter == NamedSettingsLayers.All) { popupMenu.CreateSeparator(); diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index f413b5f5a..b4d723535 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -20,7 +20,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.SwitchToPrinterSettings(); testRunner.ClickByName("Features Tab"); testRunner.ClickByName("Slice Settings Overflow Menu"); - testRunner.ClickByName("Expand All Menu Item"); + testRunner.ClickByName("Advanced Menu Item"); Assert.IsFalse(testRunner.WaitForName("print_leveling_solution Row", .5), "Print leveling should not exist for an Airwolf HD"); // Add printer that does not have hardware leveling @@ -29,7 +29,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.SwitchToPrinterSettings(); testRunner.ClickByName("Features Tab"); testRunner.ClickByName("Slice Settings Overflow Menu"); - testRunner.ClickByName("Expand All Menu Item"); + testRunner.ClickByName("Advanced Menu Item"); Assert.IsTrue(testRunner.WaitForName("print_leveling_solution Row"), "Print leveling should exist for a 3D Factory MendelMax"); return Task.CompletedTask;