Index: Core/Gui/src/Core.Gui/Plugin/ViewInfo.cs =================================================================== diff -u -rbed69a29a7d6fcdc6740c085fb79408eb7cc163d -r34f730c1dad7cc45cfc18f9093780ba70e6df191 --- Core/Gui/src/Core.Gui/Plugin/ViewInfo.cs (.../ViewInfo.cs) (revision bed69a29a7d6fcdc6740c085fb79408eb7cc163d) +++ Core/Gui/src/Core.Gui/Plugin/ViewInfo.cs (.../ViewInfo.cs) (revision 34f730c1dad7cc45cfc18f9093780ba70e6df191) @@ -20,9 +20,8 @@ // All rights reserved. using System; -using System.Drawing; +using System.Windows.Media; using Core.Common.Controls.Views; -using FontFamily = System.Windows.Media.FontFamily; namespace Core.Gui.Plugin { @@ -70,11 +69,6 @@ public Func GetViewName { get; set; } /// - /// Gets or sets the icon of the view. - /// - public Image Image { get; set; } - - /// /// Gets or sets the method used to determine the symbol for the view. /// public Func GetSymbol { get; set; } @@ -208,11 +202,6 @@ public Func GetViewName { get; set; } /// - /// Gets or sets the icon of the view. - /// - public Image Image { get; set; } - - /// /// Gets or sets the method used to determine the symbol for the view. /// public Func GetSymbol { get; set; } @@ -288,7 +277,6 @@ ViewDataType = viewInfo.ViewDataType, ViewType = viewInfo.ViewType, Description = viewInfo.Description, - Image = viewInfo.Image, GetSymbol = () => viewInfo.GetSymbol != null ? viewInfo.GetSymbol() : string.Empty, GetFontFamily = () => viewInfo.GetFontFamily?.Invoke(), AdditionalDataCheck = o => viewInfo.AdditionalDataCheck == null || viewInfo.AdditionalDataCheck((TData) o), Index: Core/Gui/test/Core.Gui.Test/Plugin/ViewInfoTest.cs =================================================================== diff -u -r17413f1161c339cd6db67c96c7005bd31a6a31f6 -r34f730c1dad7cc45cfc18f9093780ba70e6df191 --- Core/Gui/test/Core.Gui.Test/Plugin/ViewInfoTest.cs (.../ViewInfoTest.cs) (revision 17413f1161c339cd6db67c96c7005bd31a6a31f6) +++ Core/Gui/test/Core.Gui.Test/Plugin/ViewInfoTest.cs (.../ViewInfoTest.cs) (revision 34f730c1dad7cc45cfc18f9093780ba70e6df191) @@ -20,13 +20,11 @@ // All rights reserved. using System; -using System.Drawing; +using System.Windows.Media; using Core.Common.Controls.Views; using Core.Gui.Plugin; -using Core.Gui.Test.Properties; using NUnit.Framework; using Rhino.Mocks; -using FontFamily = System.Windows.Media.FontFamily; namespace Core.Gui.Test.Plugin { @@ -45,7 +43,6 @@ Assert.IsNull(viewInfo.ViewType); Assert.IsNull(viewInfo.Description); Assert.IsNull(viewInfo.GetViewName); - Assert.IsNull(viewInfo.Image); Assert.IsNull(viewInfo.GetSymbol); Assert.IsNull(viewInfo.GetFontFamily); Assert.IsNull(viewInfo.AdditionalDataCheck); @@ -70,7 +67,6 @@ Type viewType = typeof(StringView); const string newDescription = ""; string GetViewName(IView view, object o) => ""; - Image image = Resources.abacus; string GetSymbol() => ""; FontFamily GetFontFamily() => new FontFamily(); bool AdditionalDataCheck(object o) => true; @@ -85,7 +81,6 @@ viewInfo.ViewType = viewType; viewInfo.Description = newDescription; viewInfo.GetViewName = GetViewName; - viewInfo.Image = image; viewInfo.GetSymbol = GetSymbol; viewInfo.GetFontFamily = GetFontFamily; viewInfo.AdditionalDataCheck = AdditionalDataCheck; @@ -100,7 +95,6 @@ Assert.AreEqual(viewType, viewInfo.ViewType); Assert.AreEqual(newDescription, viewInfo.Description); Assert.AreEqual((Func) GetViewName, viewInfo.GetViewName); - Assert.AreEqual(image, viewInfo.Image); Assert.AreEqual((Func) GetSymbol, viewInfo.GetSymbol); Assert.AreEqual((Func) GetFontFamily, viewInfo.GetFontFamily); Assert.AreEqual((Func) AdditionalDataCheck, viewInfo.AdditionalDataCheck); @@ -162,7 +156,6 @@ Assert.AreEqual(typeof(StringView), viewInfo.ViewType); Assert.IsNull(viewInfo.Description); Assert.IsNull(viewInfo.GetViewName); - Assert.IsNull(viewInfo.Image); Assert.IsNull(viewInfo.GetSymbol); Assert.IsNull(viewInfo.GetFontFamily); Assert.IsNull(viewInfo.AdditionalDataCheck); @@ -180,7 +173,6 @@ const string newDescription = ""; string GetViewName(IView view, int o) => ""; - Image image = Resources.abacus; string GetSymbol() => ""; FontFamily GetFontFamily() => new FontFamily(); bool AdditionalDataCheck(int o) => true; @@ -192,7 +184,6 @@ // Call viewInfo.Description = newDescription; viewInfo.GetViewName = (Func) GetViewName; - viewInfo.Image = image; viewInfo.GetSymbol = GetSymbol; viewInfo.GetFontFamily = GetFontFamily; viewInfo.AdditionalDataCheck = AdditionalDataCheck; @@ -204,7 +195,6 @@ // Assert Assert.AreEqual(newDescription, viewInfo.Description); Assert.AreEqual((Func) GetViewName, viewInfo.GetViewName); - Assert.AreEqual(image, viewInfo.Image); Assert.AreEqual((Func) GetSymbol, viewInfo.GetSymbol); Assert.AreEqual((Func) GetFontFamily, viewInfo.GetFontFamily); Assert.AreEqual((Func) AdditionalDataCheck, viewInfo.AdditionalDataCheck); @@ -263,7 +253,6 @@ return newViewName; } - Image image = Resources.abacus; string GetSymbol() => symbol; FontFamily GetFontFamily() => fontFamily; @@ -297,7 +286,6 @@ viewInfo.Description = newDescription; viewInfo.GetViewName = (Func) GetViewName; - viewInfo.Image = image; viewInfo.GetSymbol = GetSymbol; viewInfo.GetFontFamily = GetFontFamily; viewInfo.AdditionalDataCheck = AdditionalDataCheck; @@ -322,7 +310,6 @@ Assert.AreEqual(typeof(StringView), info.ViewType); Assert.AreEqual(newDescription, info.Description); Assert.AreEqual(newViewName, info.GetViewName(stringView, dataObject)); - Assert.AreEqual(image, info.Image); Assert.AreEqual(symbol, info.GetSymbol()); Assert.AreSame(fontFamily, info.GetFontFamily()); Assert.IsTrue(viewInfo.AdditionalDataCheck(dataObject));