diff --git a/ApplicationView/MenuRow/MenuBase.cs b/ApplicationView/MenuRow/MenuBase.cs index 6bd5731b6..8b6408f12 100644 --- a/ApplicationView/MenuRow/MenuBase.cs +++ b/ApplicationView/MenuRow/MenuBase.cs @@ -6,24 +6,24 @@ using System.Collections.Generic; namespace MatterHackers.MatterControl { - public abstract class MenuBase : GuiWidget + public class MenuItemAction { - public class MenuItemAction + public MenuItemAction(string title, Action action) { - public MenuItemAction(string title, Action action) - { - this.Title = title; - this.Action = action; - } - - public string Title { get; set; } - public Action Action { get; set; } + this.Title = title; + this.Action = action; } - public DropDownMenu MenuDropList; - private List menuItems = null; + public string Title { get; set; } + public Action Action { get; set; } + } - protected abstract IEnumerable GetMenuItems(); + public abstract class MenuBase : GuiWidget + { + public DropDownMenu MenuDropList; + private List menuActions = null; + + protected abstract IEnumerable GetMenuActions(); public MenuBase(string menuName) { @@ -36,10 +36,10 @@ namespace MatterHackers.MatterControl MenuDropList.DrawDirectionalArrow = false; MenuDropList.MenuAsWideAsItems = false; - menuItems = new List(GetMenuItems()); + menuActions = new List(GetMenuActions()); BorderDouble padding = MenuDropList.MenuItemsPadding; //Add the menu items to the menu itself - foreach (MenuItemAction item in menuItems) + foreach (MenuItemAction item in menuActions) { if (item.Title.StartsWith("-----")) { @@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl private void MenuDropList_SelectionChanged(object sender, EventArgs e) { string menuSelection = ((DropDownMenu)sender).SelectedValue; - foreach (MenuItemAction item in menuItems) + foreach (MenuItemAction item in menuActions) { if (item.Title == menuSelection && item.Action != null) { diff --git a/ApplicationView/MenuRow/MenuOptionFile.cs b/ApplicationView/MenuRow/MenuOptionFile.cs index 5425a8d8e..61ecb94d4 100644 --- a/ApplicationView/MenuRow/MenuOptionFile.cs +++ b/ApplicationView/MenuRow/MenuOptionFile.cs @@ -30,7 +30,7 @@ namespace MatterHackers.MatterControl } - protected override IEnumerable GetMenuItems() + protected override IEnumerable GetMenuActions() { return new List { diff --git a/ApplicationView/MenuRow/MenuOptionHelp.cs b/ApplicationView/MenuRow/MenuOptionHelp.cs index a423c0832..b446165ad 100644 --- a/ApplicationView/MenuRow/MenuOptionHelp.cs +++ b/ApplicationView/MenuRow/MenuOptionHelp.cs @@ -16,7 +16,7 @@ namespace MatterHackers.MatterControl Name = "Help Menu"; } - protected override IEnumerable GetMenuItems() + protected override IEnumerable GetMenuActions() { return new List { diff --git a/ApplicationView/MenuRow/MenuOptionSettings.cs b/ApplicationView/MenuRow/MenuOptionSettings.cs index 78334e50e..cbf9bd928 100644 --- a/ApplicationView/MenuRow/MenuOptionSettings.cs +++ b/ApplicationView/MenuRow/MenuOptionSettings.cs @@ -21,7 +21,7 @@ namespace MatterHackers.MatterControl { } - protected override IEnumerable GetMenuItems() + protected override IEnumerable GetMenuActions() { return new List {