From 813a83e6cebd20a2a90ad7f7d92cf039e9c6d998 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 24 Apr 2015 12:15:22 -0400 Subject: [PATCH] Added menu bar and toolbar item image loading --- .../MainWindow.cs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs index 44e26384..f7a68ce9 100644 --- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs +++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs @@ -150,11 +150,17 @@ namespace UniversalEditor.UserInterface.WindowsForms } tsi.Tag = cmd; + tsi.Image = AwesomeControls.Theming.Theme.CurrentTheme.GetImage("Commands/" + cmd.ID + ".png"); tsi.Text = cmd.Title.Replace("_", "&"); foreach (CommandItem item1 in cmd.Items) { LoadCommandBarItem(item1, tsi); } + if (tsi.DropDownItems.Count > 0) tsi.Image = tsi.DropDownItems[0].Image; + if (tsi.Image != null && !isOnDropDown ) + { + tsi.DisplayStyle = ToolStripItemDisplayStyle.Image; + } return tsi; } else @@ -169,6 +175,11 @@ namespace UniversalEditor.UserInterface.WindowsForms tsi = new ToolStripMenuItem(); } tsi.Tag = cmd; + tsi.Image = AwesomeControls.Theming.Theme.CurrentTheme.GetImage("Commands/" + cmd.ID + ".png"); + if (tsi.Image != null && !isOnDropDown) + { + tsi.DisplayStyle = ToolStripItemDisplayStyle.Image; + } tsi.Text = cmd.Title.Replace("_", "&"); tsi.Click += tsbCommandBarButton_Click; return tsi; @@ -250,6 +261,7 @@ namespace UniversalEditor.UserInterface.WindowsForms ToolStripMenuItem tsmi = new ToolStripMenuItem(); tsmi.Name = cmd.ID; tsmi.Click += tsmiCommand_Click; + tsmi.Image = AwesomeControls.Theming.Theme.CurrentTheme.GetImage("Commands/" + cmd.ID + ".png"); tsmi.Tag = cmd; tsmi.Text = cmd.Title.Replace("_", "&"); tsmi.ShortcutKeys = ShortcutKeyToWinFormsKeys(cmd.ShortcutKey);