Index: Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs =================================================================== diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71) +++ Core/Common/src/Core.Common.Gui/ContextMenu/GuiContextMenuItemFactory.cs (.../GuiContextMenuItemFactory.cs) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -143,7 +143,7 @@ var newItem = new ToolStripMenuItem(Resources.Properties) { ToolTipText = Resources.Properties_ToolTip, - Image = Resources.PropertiesIcon, + Image = Resources.PropertiesHS, Enabled = canShowProperties }; newItem.Click += (s, e) => applicationFeatureCommandHandler.ShowPropertiesFor(dataObject); Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -r8760b8163ab56db9718bdb17715304bc1c7d63a9 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 8760b8163ab56db9718bdb17715304bc1c7d63a9) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -378,8 +378,6 @@ - - @@ -394,23 +392,15 @@ - - - PublicSettingsSingleFileGenerator Settings.Designer.cs - - - - - @@ -421,18 +411,14 @@ - - - - Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r332822d71574cddbf4d5eb0a1c6f985b29af12b0 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 332822d71574cddbf4d5eb0a1c6f985b29af12b0) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -1217,16 +1217,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap PropertiesIcon { - get { - object obj = ResourceManager.GetObject("PropertiesIcon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Alfabetisch. /// public static string PropertyGridView_Order_Alphabetically { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r332822d71574cddbf4d5eb0a1c6f985b29af12b0 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 332822d71574cddbf4d5eb0a1c6f985b29af12b0) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -487,9 +487,6 @@ Ei&genschappen - - ..\resources\property.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\arrow-stop-090.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Index: Core/Common/src/Core.Common.Gui/Resources/-1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/application_form1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/application_form2.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/application_view_list2.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/bg.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/brick_add1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/brick_delete1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/bricks1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/folder1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/link1.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/new.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/project-16.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/property.png =================================================================== diff -u -rd626df632ea0fa550e1e0811dce714b9486ee926 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/table_delete.png =================================================================== diff -u -re388ea76d1d044298cc89156c8744fbea1bcb736 -rdc41fb966f99f5200c570d70e16397087ffa87c8 Binary files differ Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs =================================================================== diff -u -rd03f2b52982110a0f804adfefe73f86551c59e62 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision d03f2b52982110a0f804adfefe73f86551c59e62) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -394,7 +394,7 @@ Assert.IsInstanceOf(result); Assert.AreEqual(1, result.Items.Count); - TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Properties, Resources.Properties_ToolTip, Resources.PropertiesIcon, hasPropertiesForNodeData); + TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Properties, Resources.Properties_ToolTip, Resources.PropertiesHS, hasPropertiesForNodeData); mocks.VerifyAll(); } Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs =================================================================== diff -u -r5774b9c9fd8cc22fc2196ec871431631133e6221 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision 5774b9c9fd8cc22fc2196ec871431631133e6221) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/GuiContextMenuItemFactoryTest.cs (.../GuiContextMenuItemFactoryTest.cs) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -233,7 +233,7 @@ // Assert Assert.AreEqual(Resources.Properties, item.Text); Assert.AreEqual(Resources.Properties_ToolTip, item.ToolTipText); - TestHelper.AssertImagesAreEqual(Resources.PropertiesIcon, item.Image); + TestHelper.AssertImagesAreEqual(Resources.PropertiesHS, item.Image); Assert.AreEqual(hasPropertyInfoForNodeData, item.Enabled); mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r1c12cc63ca9bbc35f1e2f896b1767819f2234ca7 -rdc41fb966f99f5200c570d70e16397087ffa87c8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 1c12cc63ca9bbc35f1e2f896b1767819f2234ca7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision dc41fb966f99f5200c570d70e16397087ffa87c8) @@ -274,7 +274,7 @@ TestHelper.AssertContextMenuStripContainsItem(menu, 16, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, - CoreCommonGuiResources.PropertiesIcon, + CoreCommonGuiResources.PropertiesHS, false); CollectionAssert.AllItemsAreInstancesOfType(new[] { @@ -379,7 +379,7 @@ TestHelper.AssertContextMenuStripContainsItem(menu, 15, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, - CoreCommonGuiResources.PropertiesIcon, + CoreCommonGuiResources.PropertiesHS, false); CollectionAssert.AllItemsAreInstancesOfType(new[] { @@ -478,7 +478,7 @@ TestHelper.AssertContextMenuStripContainsItem(menu, 13, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, - CoreCommonGuiResources.PropertiesIcon, + CoreCommonGuiResources.PropertiesHS, false); CollectionAssert.AllItemsAreInstancesOfType(new[] {