From 6ee8782d7efb43dff2b9a8e67a7d2aadc0ba01d4 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Wed, 17 Feb 2021 21:11:54 -0500 Subject: [PATCH] remove ancient cruft --- .../UniversalEditor.UserInterface/Editor.cs | 3 - .../UniversalEditor.UserInterface/Engine.cs | 13 -- .../IHostApplicationWindow.cs | 3 - .../MainWindow.cs | 14 +- .../UniversalEditor.UserInterface/MenuBar.cs | 195 ------------------ .../UniversalEditor.UserInterface.csproj | 1 - 6 files changed, 1 insertion(+), 228 deletions(-) delete mode 100644 Libraries/UniversalEditor.UserInterface/MenuBar.cs diff --git a/Libraries/UniversalEditor.UserInterface/Editor.cs b/Libraries/UniversalEditor.UserInterface/Editor.cs index 38a65426..c728ab2e 100644 --- a/Libraries/UniversalEditor.UserInterface/Editor.cs +++ b/Libraries/UniversalEditor.UserInterface/Editor.cs @@ -669,9 +669,6 @@ namespace UniversalEditor.UserInterface } #endregion - private MenuBar mvarMenuBar = new MenuBar(); - public MenuBar MenuBar { get { return mvarMenuBar; } } - private CommandBar.CommandBarCollection mvarToolbars = new CommandBar.CommandBarCollection(); public CommandBar.CommandBarCollection Toolbars { get { return mvarToolbars; } } diff --git a/Libraries/UniversalEditor.UserInterface/Engine.cs b/Libraries/UniversalEditor.UserInterface/Engine.cs index ee2fd6cf..01733aed 100644 --- a/Libraries/UniversalEditor.UserInterface/Engine.cs +++ b/Libraries/UniversalEditor.UserInterface/Engine.cs @@ -1264,18 +1264,5 @@ namespace UniversalEditor.UserInterface } } } - - public virtual ActionMenuItem[] CreateMenuItemsFromPlaceholder(PlaceholderMenuItem pmi) - { - List list = new List(); - switch (pmi.PlaceholderID) - { - case "RecentFiles": - { - break; - } - } - return list.ToArray(); - } } } diff --git a/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs b/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs index 86acf258..0d3555f3 100644 --- a/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs +++ b/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs @@ -63,9 +63,6 @@ namespace UniversalEditor.UserInterface /// /// True if the user accepted the dialog; false otherwise. bool ShowOptionsDialog(); - - void ToggleMenuItemEnabled(string menuItemName, bool enabled); - void RefreshCommand(object nativeCommandObject); void UpdateStatus(string statusText); diff --git a/Libraries/UniversalEditor.UserInterface/MainWindow.cs b/Libraries/UniversalEditor.UserInterface/MainWindow.cs index 2cca8cb7..a7c7f39f 100644 --- a/Libraries/UniversalEditor.UserInterface/MainWindow.cs +++ b/Libraries/UniversalEditor.UserInterface/MainWindow.cs @@ -1346,16 +1346,6 @@ namespace UniversalEditor.UserInterface return ((UIApplication)Application.Instance).ShowSettingsDialog(); } - public void ToggleMenuItemEnabled(string menuItemName, bool enabled) - { - throw new NotImplementedException(); - } - - public void RefreshCommand(object nativeCommandObject) - { - throw new NotImplementedException(); - } - private void AddRecentMenuItem(string FileName) { Command mnuFileRecentFiles = ((UIApplication)Application.Instance).Commands["FileRecentFiles"]; @@ -1447,9 +1437,7 @@ namespace UniversalEditor.UserInterface { get { - if (pnlSolutionExplorer.Project != null) - return pnlSolutionExplorer.Project; - return null; + return pnlSolutionExplorer.Project; } set { diff --git a/Libraries/UniversalEditor.UserInterface/MenuBar.cs b/Libraries/UniversalEditor.UserInterface/MenuBar.cs deleted file mode 100644 index 6c3e5612..00000000 --- a/Libraries/UniversalEditor.UserInterface/MenuBar.cs +++ /dev/null @@ -1,195 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using MBS.Framework; - -namespace UniversalEditor.UserInterface -{ - public class MenuBar - { - private MenuItem.MenuItemCollection mvarItems = new MenuItem.MenuItemCollection(); - public MenuItem.MenuItemCollection Items { get { return mvarItems; } } - } - - public abstract class MenuItem - { - public class MenuItemCollection - : System.Collections.ObjectModel.Collection - { - private System.Collections.Generic.Dictionary itemsByName = new Dictionary(); - - public ActionMenuItem Add(string name, string title) - { - return Add(name, title, null); - } - public ActionMenuItem Add(string name, string title, EventHandler onClick) - { - return Add(name, title, onClick, Count); - } - public ActionMenuItem Add(string name, string title, int position) - { - return Add(name, title, null, position); - } - public ActionMenuItem Add(string name, string title, EventHandler onClick, int position) - { - ActionMenuItem item = new ActionMenuItem(name, title); - if (onClick != null) - { - item.Click += onClick; - } - item.Position = position; - Add(item); - return item; - } - public SeparatorMenuItem AddSeparator() - { - return AddSeparator(Count); - } - public SeparatorMenuItem AddSeparator(int position) - { - SeparatorMenuItem item = new SeparatorMenuItem(); - item.Position = position; - item.Name = "separator__" + (Count + 1).ToString(); - Add(item); - return item; - } - - public MenuItem this[string name] - { - get - { - return itemsByName[name]; - } - } - - public bool Contains(string name) - { - return itemsByName.ContainsKey(name); - } - public bool Remove(string name) - { - if (itemsByName.ContainsKey(name)) - { - base.Remove(itemsByName[name]); - return true; - } - return false; - } - - protected override void InsertItem(int index, MenuItem item) - { - item.mvarParent = this; - base.InsertItem(index, item); - itemsByName.Add(item.Name, item); - } - protected override void RemoveItem(int index) - { - this[index].mvarParent = null; - itemsByName.Remove(this[index].Name); - base.RemoveItem(index); - } - - internal void UpdateName(MenuItem item, string oldName) - { - itemsByName.Remove(oldName); - itemsByName.Add(item.Name, item); - } - } - - private List mvarNativeControls = new List(); - public List NativeControls { get { return mvarNativeControls; } } - - private MenuItemCollection mvarParent = null; - - private string mvarName = String.Empty; - public string Name - { - get { return mvarName; } - set - { - string oldName = mvarName; mvarName = value; - if (mvarParent != null) - { - mvarParent.UpdateName(this, oldName); - } - } - } - - private int mvarPosition = -1; - public int Position { get { return mvarPosition; } set { mvarPosition = value; } } - - private bool mvarEnabled = true; - public bool Enabled - { - get { return mvarEnabled; } - set - { - mvarEnabled = value; - foreach (object NativeControl in mvarNativeControls) - { - (Application.Instance as IHostApplication).CurrentWindow.RefreshCommand(NativeControl); - } - } - } - - private bool mvarVisible = true; - public bool Visible { get { return mvarVisible; } - set - { - mvarVisible = value; - foreach (object NativeControl in mvarNativeControls) - { - (Application.Instance as IHostApplication).CurrentWindow.RefreshCommand(NativeControl); - } - } - } - } - - public class ActionMenuItem : MenuItem - { - private string mvarTitle = String.Empty; - public string Title { get { return mvarTitle; } set { mvarTitle = value; } } - - private MenuItem.MenuItemCollection mvarItems = new MenuItem.MenuItemCollection(); - public MenuItem.MenuItemCollection Items { get { return mvarItems; } } - - private CommandDisplayStyle mvarDisplayStyle = CommandDisplayStyle.ImageOnly; - public CommandDisplayStyle DisplayStyle { get { return mvarDisplayStyle; } set { mvarDisplayStyle = value; } } - - public event EventHandler Click; - - public ActionMenuItem(string title) - { - base.Name = title; - mvarTitle = title; - } - public ActionMenuItem(string name, string title) - { - base.Name = name; - mvarTitle = title; - } - - - public void OnClick(EventArgs e) - { - if (Click != null) - { - Click(this, e); - } - } - } - public class SeparatorMenuItem : MenuItem - { - - } - public class PlaceholderMenuItem : MenuItem - { - private string mvarPlaceholderID = String.Empty; - public string PlaceholderID { get { return mvarPlaceholderID; } set { mvarPlaceholderID = value; } } - - public PlaceholderMenuItem(string placeholderID) - { - mvarPlaceholderID = placeholderID; - } - } -} diff --git a/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj b/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj index 7858785b..bb0d0638 100644 --- a/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj +++ b/Libraries/UniversalEditor.UserInterface/UniversalEditor.UserInterface.csproj @@ -79,7 +79,6 @@ -