From 86ea89730bc2d84444f525a51c559a3a38b2942e Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Wed, 12 Feb 2020 01:27:04 -0500 Subject: [PATCH] loading of command bars has been moved to UWT --- .../MainWindow.cs | 40 +------------------ 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs b/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs index b349260b..3e496c6f 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface/MainWindow.cs @@ -95,40 +95,7 @@ namespace UniversalEditor.UserInterface */ return tab; } - - private Toolbar LoadCommandBar(CommandBar cb) - { - Toolbar tb = new Toolbar(); - foreach (CommandItem ci in cb.Items) - { - if (ci is SeparatorCommandItem) - { - tb.Items.Add(new ToolbarItemSeparator()); - } - else if (ci is CommandReferenceCommandItem) - { - CommandReferenceCommandItem crci = (ci as CommandReferenceCommandItem); - Command cmd = Application.Commands[crci.CommandID]; - if (cmd == null) continue; - - ToolbarItemButton tsb = new ToolbarItemButton(cmd.ID, (StockType)cmd.StockType); - tsb.SetExtraData("crci", crci); - tsb.Click += tsbCommand_Click; - tsb.Title = cmd.Title; - tb.Items.Add(tsb); - } - } - return tb; - } - - private void tsbCommand_Click(object sender, EventArgs e) - { - ToolbarItemButton tsb = (sender as ToolbarItemButton); - CommandReferenceCommandItem crci = tsb.GetExtraData("crci"); - Command cmd = Application.Commands[crci.CommandID]; - cmd.Execute(); - } - + protected override void OnLostFocus(EventArgs e) { base.OnLostFocus(e); @@ -217,11 +184,6 @@ namespace UniversalEditor.UserInterface this.Ribbon.Tabs.Add (ribbonTabHome); } } - if (this.CommandDisplayMode == CommandDisplayMode.CommandBar || this.CommandDisplayMode == CommandDisplayMode.Both) { - foreach (CommandBar cb in Application.CommandBars) { - this.Controls.Add (LoadCommandBar(cb)); - } - } dckContainer = new DockingContainerControl(); dckContainer.SelectionChanged += dckContainer_SelectionChanged; Controls.Add (dckContainer, new BoxLayout.Constraints(true, true, 0, BoxLayout.PackType.Start));