Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rd3747e8b32bdedc478c8182bce75fba78269d34d -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d3747e8b32bdedc478c8182bce75fba78269d34d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -61,7 +61,7 @@ } /// - /// Looks up a localized string similar to Alles berekenen. + /// Looks up a localized string similar to Alles be&rekenen. /// public static string Calculate_all { get { @@ -89,7 +89,7 @@ } /// - /// Looks up a localized string similar to Wis alle uitvoer. + /// Looks up a localized string similar to &Wis alle uitvoer. /// public static string Clear_all_output { get { @@ -109,9 +109,9 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap ClearOutputIcon { + public static System.Drawing.Bitmap ClearIcon { get { - object obj = ResourceManager.GetObject("ClearOutputIcon", resourceCulture); + object obj = ResourceManager.GetObject("ClearIcon", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -129,16 +129,6 @@ /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - public static System.Drawing.Bitmap EraseIcon { - get { - object obj = ResourceManager.GetObject("EraseIcon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// public static System.Drawing.Bitmap ExpandAllIcon { get { object obj = ResourceManager.GetObject("ExpandAllIcon", resourceCulture); @@ -238,7 +228,7 @@ } /// - /// Looks up a localized string similar to Wis de huidige gegevens.. + /// Looks up a localized string similar to Wis de gegevens.. /// public static string FailureMechanism_InputsOutputs_Erase_ToolTip { get { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx =================================================================== diff -u -rd3747e8b32bdedc478c8182bce75fba78269d34d -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d3747e8b32bdedc478c8182bce75fba78269d34d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -146,16 +146,16 @@ Uitvoer - Alles berekenen + Alles be&rekenen - Wis alle uitvoer + &Wis alle uitvoer &Wissen - Wis de huidige gegevens. + Wis de gegevens. &Exporteren... @@ -181,9 +181,6 @@ Laat de eigenschappen zien in het eigenschappenvenster. - - ..\resources\cross-script.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\table-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -202,9 +199,6 @@ Valideer en voer alle berekeningen binnen het faalmechanisme uit. - - ..\resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Wis de uitvoer van alle berekeningen binnen het faalmechanisme. @@ -226,4 +220,7 @@ Klap deze knoop en al zijn kinderen uit. + + ..\resources\table_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismNodePresenter.cs =================================================================== diff -u -rd3747e8b32bdedc478c8182bce75fba78269d34d -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismNodePresenter.cs (.../FailureMechanismNodePresenter.cs) (revision d3747e8b32bdedc478c8182bce75fba78269d34d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismNodePresenter.cs (.../FailureMechanismNodePresenter.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -38,16 +38,10 @@ contextMenu.AddMenuItem( RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, - RingtoetsCommonFormsResources.ClearOutputIcon, null); + RingtoetsCommonFormsResources.ClearIcon, null); contextMenu.AddSeperator(); contextMenu.AddMenuItem( - RingtoetsCommonFormsResources.FailureMechanism_Export, - RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, - RingtoetsCommonFormsResources.ExportIcon, null); - contextMenu.AddSeperator(); - - contextMenu.AddMenuItem( RingtoetsCommonFormsResources.FailureMechanism_Expand_all, RingtoetsCommonFormsResources.FailureMechanism_Expand_all_ToolTip, RingtoetsCommonFormsResources.ExpandAllIcon, null); @@ -58,6 +52,12 @@ contextMenu.AddSeperator(); contextMenu.AddMenuItem( + RingtoetsCommonFormsResources.FailureMechanism_Export, + RingtoetsCommonFormsResources.FailureMechanism_Export_ToolTip, + RingtoetsCommonFormsResources.ExportIcon, null); + contextMenu.AddSeperator(); + + contextMenu.AddMenuItem( RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon, null); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/PlaceholderWithReadonlyNameNodePresenter.cs =================================================================== diff -u -rd3747e8b32bdedc478c8182bce75fba78269d34d -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/PlaceholderWithReadonlyNameNodePresenter.cs (.../PlaceholderWithReadonlyNameNodePresenter.cs) (revision d3747e8b32bdedc478c8182bce75fba78269d34d) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/PlaceholderWithReadonlyNameNodePresenter.cs (.../PlaceholderWithReadonlyNameNodePresenter.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -42,6 +42,12 @@ RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Open_ToolTip, RingtoetsCommonFormsResources.OpenIcon, null); contextMenu.AddSeperator(); + + contextMenu.AddMenuItem( + RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase, + RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip, + RingtoetsCommonFormsResources.ClearIcon, null); + contextMenu.AddSeperator(); } if (nodeData is InputPlaceholder) @@ -61,12 +67,6 @@ contextMenu.AddSeperator(); contextMenu.AddMenuItem( - RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase, - RingtoetsCommonFormsResources.FailureMechanism_InputsOutputs_Erase_ToolTip, - RingtoetsCommonFormsResources.EraseIcon, null); - contextMenu.AddSeperator(); - - contextMenu.AddMenuItem( RingtoetsCommonFormsResources.FailureMechanism_Properties, RingtoetsCommonFormsResources.FailureMechanism_Properties_ToolTip, RingtoetsCommonFormsResources.PropertiesIcon, null); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs =================================================================== diff -u -rd3747e8b32bdedc478c8182bce75fba78269d34d -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs (.../PipingCalculationInputsNodePresenter.cs) (revision d3747e8b32bdedc478c8182bce75fba78269d34d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationInputsNodePresenter.cs (.../PipingCalculationInputsNodePresenter.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -115,7 +115,7 @@ var clearOutputItem = contextMenu.AddMenuItem(Resources.Clear_output, null, - RingtoetsFormsResources.ClearOutputIcon, + RingtoetsFormsResources.ClearIcon, (o, args) => { pipingData.ClearOutput(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs =================================================================== diff -u -rd3747e8b32bdedc478c8182bce75fba78269d34d -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision d3747e8b32bdedc478c8182bce75fba78269d34d) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs (.../PipingFailureMechanismNodePresenter.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -71,7 +71,7 @@ var clearOutputNode = rootMenu.AddMenuItem(RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, - RingtoetsCommonFormsResources.ClearOutputIcon, (o, args) => + RingtoetsCommonFormsResources.ClearIcon, (o, args) => { foreach (var calc in failureMechanism.Calculations) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6b3d2269de35bec503bbd3965ae9b532e1c6f216 -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6b3d2269de35bec503bbd3965ae9b532e1c6f216) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -115,7 +115,7 @@ } /// - /// Looks up a localized string similar to Wis uitvoer. + /// Looks up a localized string similar to &Wis uitvoer. /// public static string Clear_output { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r6b3d2269de35bec503bbd3965ae9b532e1c6f216 -rf17434ebd33ce14befc2e0f0150a66f831ed3e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6b3d2269de35bec503bbd3965ae9b532e1c6f216) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision f17434ebd33ce14befc2e0f0150a66f831ed3e07) @@ -440,7 +440,7 @@ De berekening heeft geen uitvoer om te wissen. - Wis uitvoer + &Wis uitvoer Er zijn geen berekeningen met uitvoer om te wissen.