Index: Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.Designer.cs =================================================================== diff -u -rf2d4c63c85b952a15075468b5f48048ff5122d95 -r3155b1643fdab8d782cd8b89684e595fe34adcea --- Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision f2d4c63c85b952a15075468b5f48048ff5122d95) +++ Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision 3155b1643fdab8d782cd8b89684e595fe34adcea) @@ -20,6 +20,8 @@ // All rights reserved. using System.Windows.Forms; +using Core.Common.Controls.Forms; +using Core.Common.Controls.Style; namespace Core.Gui.Forms.Log { @@ -129,6 +131,7 @@ this.messagesToolStrip.BackColor = System.Drawing.SystemColors.ControlLight; resources.ApplyResources(this.messagesToolStrip, "messagesToolStrip"); this.messagesToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.messagesToolStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.messagesToolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buttonShowInfo, this.buttonShowWarning, @@ -137,36 +140,38 @@ this.buttonShowDetails}); this.messagesToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.messagesToolStrip.Name = "messagesToolStrip"; + this.messagesToolStrip.Renderer = new CustomToolStripRenderer(); + this.messagesToolStrip.BackColor = ColorDefinitions.ControlBackgroundColor; // // buttonShowInfo // this.buttonShowInfo.Checked = true; this.buttonShowInfo.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonShowInfo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonShowInfo.Image = global::Core.Gui.Properties.Resources.information; resources.ApplyResources(this.buttonShowInfo, "buttonShowInfo"); + this.buttonShowInfo.Text = "\uE909"; this.buttonShowInfo.Name = "buttonShowInfo"; this.buttonShowInfo.Click += new System.EventHandler(this.ButtonShowInfoClick); + this.buttonShowInfo.Margin = new System.Windows.Forms.Padding(2); // // buttonShowWarning // this.buttonShowWarning.Checked = true; this.buttonShowWarning.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonShowWarning.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonShowWarning.Image = global::Core.Gui.Properties.Resources.error; resources.ApplyResources(this.buttonShowWarning, "buttonShowWarning"); + this.buttonShowWarning.Text = "\uE90A"; this.buttonShowWarning.Name = "buttonShowWarning"; this.buttonShowWarning.Click += new System.EventHandler(this.ButtonShowWarningClick); + this.buttonShowWarning.Margin = new System.Windows.Forms.Padding(2); // // buttonShowError // this.buttonShowError.Checked = true; this.buttonShowError.CheckState = System.Windows.Forms.CheckState.Checked; - this.buttonShowError.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonShowError.Image = global::Core.Gui.Properties.Resources.exclamation; resources.ApplyResources(this.buttonShowError, "buttonShowError"); + this.buttonShowError.Text = "\uE90B"; this.buttonShowError.Name = "buttonShowError"; this.buttonShowError.Click += new System.EventHandler(this.ButtonShowErrorClick); + this.buttonShowError.Margin = new System.Windows.Forms.Padding(2); // // toolStripSeparator1 // @@ -175,11 +180,11 @@ // // buttonShowDetails // - this.buttonShowDetails.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonShowDetails.Image = global::Core.Gui.Properties.Resources.application_import_blue; resources.ApplyResources(this.buttonShowDetails, "buttonShowDetails"); + this.buttonShowDetails.Text = "\uE90C"; this.buttonShowDetails.Name = "buttonShowDetails"; this.buttonShowDetails.Click += new System.EventHandler(this.ButtonShowDetailsClick); + this.buttonShowDetails.Margin = new System.Windows.Forms.Padding(2); // // messagesDataGridView // Index: Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.cs =================================================================== diff -u -rf701bc630f0cdc6c946f01145e39313afe11f36c -r3155b1643fdab8d782cd8b89684e595fe34adcea --- Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.cs (.../MessageWindow.cs) (revision f701bc630f0cdc6c946f01145e39313afe11f36c) +++ Core/Gui/src/Core.Gui/Forms/Log/MessageWindow.cs (.../MessageWindow.cs) (revision 3155b1643fdab8d782cd8b89684e595fe34adcea) @@ -23,10 +23,14 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; +using System.Drawing; +using System.Drawing.Text; using System.Globalization; using System.IO; using System.Windows.Forms; +using Core.Common.Util.Drawing; using Core.Gui.Clipboard; +using Core.Gui.Properties; using log4net.Core; namespace Core.Gui.Forms.Log @@ -41,6 +45,9 @@ private readonly Dictionary levelImageName; private readonly ConcurrentQueue newMessages = new ConcurrentQueue(); private bool filtering; + + private static readonly PrivateFontCollection privateFontCollection = new PrivateFontCollection(); + private static readonly Font font = FontHelper.CreateFont(Resources.Symbols, privateFontCollection); /// /// Initializes a new instance of the class. @@ -53,6 +60,11 @@ MessageWindowLogAppender.Instance.MessageWindow = this; InitializeComponent(); + buttonShowDetails.Font = font; + buttonShowInfo.Font = font; + buttonShowWarning.Font = font; + buttonShowError.Font = font; + // order is the same as in log4j Level (check sources of log4net) levelImageName = new Dictionary { Index: Core/Gui/src/Core.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r00cf1098df9d6d15f3cd847d572eb789cbdb4ea3 -r3155b1643fdab8d782cd8b89684e595fe34adcea --- Core/Gui/src/Core.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 00cf1098df9d6d15f3cd847d572eb789cbdb4ea3) +++ Core/Gui/src/Core.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3155b1643fdab8d782cd8b89684e595fe34adcea) @@ -2443,6 +2443,16 @@ } /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] Symbols { + get { + object obj = ResourceManager.GetObject("Symbols", resourceCulture); + return ((byte[])(obj)); + } + } + + /// /// Looks up a localized string similar to Systeeminformatie. /// public static string SystemInformation_DisplayName { Index: Core/Gui/src/Core.Gui/Properties/Resources.resx =================================================================== diff -u -r00cf1098df9d6d15f3cd847d572eb789cbdb4ea3 -r3155b1643fdab8d782cd8b89684e595fe34adcea --- Core/Gui/src/Core.Gui/Properties/Resources.resx (.../Resources.resx) (revision 00cf1098df9d6d15f3cd847d572eb789cbdb4ea3) +++ Core/Gui/src/Core.Gui/Properties/Resources.resx (.../Resources.resx) (revision 3155b1643fdab8d782cd8b89684e595fe34adcea) @@ -937,4 +937,7 @@ Contact + + ..\Style\Symbols\Symbols.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file Index: Core/Gui/src/Core.Gui/Style/Symbols/Symbols.ttf =================================================================== diff -u -r42312b7efb17be543bfcba213b9c96c3aea0336c -r3155b1643fdab8d782cd8b89684e595fe34adcea Binary files differ