Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismSectionResultContext.cs =================================================================== diff -u -ra9aafffab97152303562110b1d789bacb465ce24 -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismSectionResultContext.cs (.../FailureMechanismSectionResultContext.cs) (revision a9aafffab97152303562110b1d789bacb465ce24) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismSectionResultContext.cs (.../FailureMechanismSectionResultContext.cs) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using Ringtoets.Common.Data; using Ringtoets.Common.Data.FailureMechanism; namespace Ringtoets.Common.Forms.PresentationObjects Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r091761507d94a388b18fefebd38a5d106b9b89c4 -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 091761507d94a388b18fefebd38a5d106b9b89c4) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -229,6 +229,16 @@ } /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap FailureMechanismContributionIcon { + get { + object obj = ResourceManager.GetObject("FailureMechanismContributionIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// /// Looks up a localized string similar to Toetslaag 1. /// public static string FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one { @@ -274,6 +284,16 @@ } /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap FailureMechanismSectionResultIcon { + get { + object obj = ResourceManager.GetObject("FailureMechanismSectionResultIcon", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// /// Looks up a localized string similar to eindpunten. /// public static string FailureMechanismSections_EndPoints_DisplayName { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -r091761507d94a388b18fefebd38a5d106b9b89c4 -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 091761507d94a388b18fefebd38a5d106b9b89c4) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -235,4 +235,10 @@ ..\Resources\blue-document--pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\chart-pie-separate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\document-task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/chart-pie-separate.png =================================================================== diff -u Binary files differ Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/document-task.png =================================================================== diff -u Binary files differ Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r091761507d94a388b18fefebd38a5d106b9b89c4 -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 091761507d94a388b18fefebd38a5d106b9b89c4) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -135,6 +135,8 @@ + + Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -112,7 +112,7 @@ { GetViewName = (v, o) => RingtoetsDataResources.FailureMechanismContribution_DisplayName, GetViewData = context => context.WrappedData, - Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, + Image = RingtoetsCommonFormsResources.FailureMechanismContributionIcon, CloseForData = CloseFailureMechanismContributionViewForData, AfterCreate = (view, context) => view.AssessmentSection = context.Parent }; @@ -126,7 +126,7 @@ yield return new ViewInfo, FailureMechanismResultView> { GetViewName = (v, o) => RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RingtoetsCommonFormsResources.GenericInputOutputIcon, + Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, CloseForData = CloseFailureMechanismResultViewForData, GetViewData = context => context.SectionResults, AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism @@ -222,7 +222,7 @@ yield return new TreeNodeInfo { Text = failureMechanismContribution => RingtoetsDataResources.FailureMechanismContribution_DisplayName, - Image = failureMechanismContribution => RingtoetsCommonFormsResources.GenericInputOutputIcon, + Image = failureMechanismContribution => RingtoetsCommonFormsResources.FailureMechanismContributionIcon, ContextMenuStrip = (failureMechanismContribution, parentData, treeViewControl) => Gui.Get(failureMechanismContribution, treeViewControl) .AddOpenItem() .AddSeparator() @@ -244,7 +244,7 @@ yield return new TreeNodeInfo { Text = context => RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon, + Image = context => RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() .Build() Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs =================================================================== diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs (.../FailureMechanismContributionContextTreeNodeInfoTest.cs) (revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs (.../FailureMechanismContributionContextTreeNodeInfoTest.cs) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -103,7 +103,7 @@ var image = info.Image(null); // Assert - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismContributionIcon, image); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs =================================================================== diff -u -r4c21758818f3c1f159de75fec5a3721fe5b50b6a -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 4c21758818f3c1f159de75fec5a3721fe5b50b6a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -211,7 +211,7 @@ var contributionViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismContributionContext)); Assert.AreEqual(typeof(FailureMechanismContributionView), contributionViewInfo.ViewType); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, contributionViewInfo.Image); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismContributionIcon, contributionViewInfo.Image); var mapViewInfo = viewInfos.Single(vi => vi.DataType == typeof(IAssessmentSection)); Assert.AreEqual(typeof(AssessmentSectionView), mapViewInfo.ViewType); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs =================================================================== diff -u -rf1bd17ba95b3fbae5928d4240523d50d8b83b64d -r3abef5ccb0ba5386c65d4156b319970fc4337a29 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs (.../FailureMechanismContributionViewInfoTest.cs) (revision f1bd17ba95b3fbae5928d4240523d50d8b83b64d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/FailureMechanismContributionViewInfoTest.cs (.../FailureMechanismContributionViewInfoTest.cs) (revision 3abef5ccb0ba5386c65d4156b319970fc4337a29) @@ -106,7 +106,7 @@ var image = info.Image; // Assert - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, image); + TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismContributionIcon, image); } [Test]