Index: Core/Common/src/Core.Common.Controls.Table/Properties/Resources.Designer.cs =================================================================== diff -u -r148b5639633795054317d492507c072ee0bd5ada -r94ad8ac133939b11df035a772cba786e53d7c20d --- Core/Common/src/Core.Common.Controls.Table/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 148b5639633795054317d492507c072ee0bd5ada) +++ Core/Common/src/Core.Common.Controls.Table/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -71,6 +71,119 @@ } /// + /// Looks up a localized string similar to Argument bevat geen bestandsnaam.. + /// + internal static string Chart_ExportAsImage_Argument_did_not_contain_a_filename { + get { + return ResourceManager.GetString("Chart_ExportAsImage_Argument_did_not_contain_a_filename", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Bestandsnaam moet een extensie hebben.. + /// + internal static string Chart_ExportAsImage_Argument_should_have_an_extension { + get { + return ResourceManager.GetString("Chart_ExportAsImage_Argument_should_have_an_extension", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Argument kan niet de waarde 'null' hebben.. + /// + internal static string Chart_ExportAsImage_Argument_should_not_be_null { + get { + return ResourceManager.GetString("Chart_ExportAsImage_Argument_should_not_be_null", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Gearceerde stijl wordt niet ondersteund voor exporteren en zal genegeerd worden.. + /// + internal static string Chart_ExportAsImage_Hatch_style_is_not_supported_for_exports_and_will_be_ignored_ { + get { + return ResourceManager.GetString("Chart_ExportAsImage_Hatch_style_is_not_supported_for_exports_and_will_be_ignored_" + + "", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Extensie ({0}) wordt niet ondersteund.. + /// + internal static string Chart_GetImageFormatByExtension_Extension_0_not_supported { + get { + return ResourceManager.GetString("Chart_GetImageFormatByExtension_Extension_0_not_supported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invoerformaat wordt niet ondersteund. Y moet numeriek zijn maar is van type: {0}.. + /// + internal static string ChartSeries_Add_Input_format_not_supported_y_must_be_numeric_but_is_of_type_0_ { + get { + return ResourceManager.GetString("ChartSeries_Add_Input_format_not_supported_y_must_be_numeric_but_is_of_type_0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ongeldig argument voor databron van gegevensreeks. Biedt u een IEnumerable aan? IList en IListSource worden ondersteund.. + /// + internal static string ChartSeries_DataSource_Invalid_argument_for_series_datasource_Are_you_passing_IEnumerable_IList_and_IListSource_are_supported { + get { + return ResourceManager.GetString("ChartSeries_DataSource_Invalid_argument_for_series_datasource_Are_you_passing_IEn" + + "umerable_IList_and_IListSource_are_supported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kan diagram niet tekenen.. + /// + internal static string ChartView_TeeChartBeforeDraw_Can_not_draw_chart { + get { + return ResourceManager.GetString("ChartView_TeeChartBeforeDraw_Can_not_draw_chart", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Onbekende TeeChart gegevensreeks: houdt geen verband met een bekende ChartSeries.. + /// + internal static string ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series_Not_related_to_any_known_ChartSeries { + get { + return ResourceManager.GetString("ChartViewSeriesToolBase_GetChartSeriesFromInternalSeries_Unknown_TeeChart_series_" + + "Not_related_to_any_known_ChartSeries", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dit programma accepteert alleen {0} als gegevensreeks.. + /// + internal static string ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts_0_as_series { + get { + return ResourceManager.GetString("ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts_0_as_series", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to 'LastSelectedSeries' moet gezet zijn voordat 'SelectedPointIndex' wordt gezet.. + /// + internal static string ChartViewSeriesToolBase_SelectedPointIndex_LastSelectedSeries_needs_to_be_set_before_SelectedPointIndex_is_set { + get { + return ResourceManager.GetString("ChartViewSeriesToolBase_SelectedPointIndex_LastSelectedSeries_needs_to_be_set_bef" + + "ore_SelectedPointIndex_is_set", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Geselecteerde index is buiten bereik van de gevensreeks.. + /// + internal static string ChartViewSeriesToolBase_SelectedPointIndex_Selected_index_outside_range_of_series { + get { + return ResourceManager.GetString("ChartViewSeriesToolBase_SelectedPointIndex_Selected_index_outside_range_of_series" + + "", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Niet te klonen subelementen in menu-element.. /// internal static string ClonableToolStripMenuItem_Clone_Unclonable_subitems_in_menu_item { @@ -341,6 +454,62 @@ } /// + /// Looks up a localized string similar to Transparantie moet tussen 0 en 100 liggen.. + /// + internal static string PolygonChartSeries_Transparency_Transparancy_should_be_between_0_and_100 { + get { + return ResourceManager.GetString("PolygonChartSeries_Transparency_Transparancy_should_be_between_0_and_100", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Aantal X-waarden moet gelijk zijn aan het aantal Y-waarden.. + /// + internal static string PolygonSeries_Draw_Number_of_X_values_should_be_equal_to_the_number_of_Y_values { + get { + return ResourceManager.GetString("PolygonSeries_Draw_Number_of_X_values_should_be_equal_to_the_number_of_Y_values", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} tot {1}. + /// + internal static string RangeLabel_0_till_1_ { + get { + return ResourceManager.GetString("RangeLabel_0_till_1_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verschil: + ///horizontaal: {0} + ///verticaal: {1}. + /// + internal static string RulerTool_GetDefaultDifferenceString_Difference_horizontal_0_vertical_1_ { + get { + return ResourceManager.GetString("RulerTool_GetDefaultDifferenceString_Difference_horizontal_0_vertical_1_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to seconden. + /// + internal static string RulerTool_GetDefaultDifferenceString_seconds { + get { + return ResourceManager.GetString("RulerTool_GetDefaultDifferenceString_seconds", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to tot. + /// + internal static string strTill { + get { + return ResourceManager.GetString("strTill", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap table_edit { @@ -629,6 +798,15 @@ } /// + /// Looks up a localized string similar to Zou geen indices lager dan -1 moeten teruggeven!. + /// + internal static string TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below_1_ { + get { + return ResourceManager.GetString("TeeChartHelper_GetNearestPoint_Should_not_return_indexes_below_1_", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap tick { @@ -684,6 +862,71 @@ } /// + /// Looks up a localized string similar to Weet u zeker dat u het volgende element wilt verwijderen: {0}. + /// + internal static string TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item_0_ { + get { + return ResourceManager.GetString("TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item_0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Het geselecteerde element kan niet worden verwijderd.. + /// + internal static string TreeView_DeleteNodeData_The_selected_item_cannot_be_removed { + get { + return ResourceManager.GetString("TreeView_DeleteNodeData_The_selected_item_cannot_be_removed", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Niet in staat om een presentatieobject te vinden voor niet geïnitialiseerd object.. + /// + internal static string TreeView_Error_Unable_to_resolve_node_presenter_for_null_data { + get { + return ResourceManager.GetString("TreeView_Error_Unable_to_resolve_node_presenter_for_null_data", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Fout tijdens slepen/neerzetten: {0}.. + /// + internal static string TreeView_TreeViewDragDrop_Error_during_drag_drop_0_ { + get { + return ResourceManager.GetString("TreeView_TreeViewDragDrop_Error_during_drag_drop_0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Structuurweergave mag niet leeg zijn.. + /// + internal static string TreeViewController_TreeViewController_Tree_view_can_t_be_null { + get { + return ResourceManager.GetString("TreeViewController_TreeViewController_Tree_view_can_t_be_null", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kan INodePresenter voor {0} niet vinden. Zorg ervoor dat u de ontbrekende INodePresenter aan de NodePresenters eigenschap van een TreeView heeft toegevoegd.. + /// + internal static string TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added_it_to_Presenters_collection_of_a_TreeView { + get { + return ResourceManager.GetString("TreeViewController_UpdateNode_Can_t_find_INodePresenter_for_0_make_sure_you_added" + + "_it_to_Presenters_collection_of_a_TreeView", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to OnNodeRenamed moet zijn geïmplementeerd in de afgeleide klasse.. + /// + internal static string TreeViewNodePresenterBase_OnNodeRenamed_OnNodeRenamed_must_be_implemented_in_derived_class { + get { + return ResourceManager.GetString("TreeViewNodePresenterBase_OnNodeRenamed_OnNodeRenamed_must_be_implemented_in_deri" + + "ved_class", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Er is een fout opgetreden. Verifieer de invoer alstublieft. /// ///Fout: Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r3cb2cb5a099fc3aaf6cd7dafb7da3db06f414122 -r94ad8ac133939b11df035a772cba786e53d7c20d --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3cb2cb5a099fc3aaf6cd7dafb7da3db06f414122) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -734,7 +734,7 @@ } /// - /// Looks up a localized string similar to Verwij&deren. + /// Looks up a localized string similar to Verwij&deren.... /// public static string Delete { get { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r3cb2cb5a099fc3aaf6cd7dafb7da3db06f414122 -r94ad8ac133939b11df035a772cba786e53d7c20d --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 3cb2cb5a099fc3aaf6cd7dafb7da3db06f414122) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -839,7 +839,7 @@ ..\Resources\arrow-000-medium.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Verwij&deren + Verwij&deren... Verwijder de knoop uit de boom. Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs =================================================================== diff -u -r0758a103361e8067e8b56eec6cc28ff0c6eba12f -r94ad8ac133939b11df035a772cba786e53d7c20d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (.../PipingCalculationContextNodePresenter.cs) (revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationContextNodePresenter.cs (.../PipingCalculationContextNodePresenter.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -12,6 +12,7 @@ using Ringtoets.Piping.Forms.Properties; using Ringtoets.Piping.Service; using RingtoetsFormsResources = Ringtoets.Common.Forms.Properties.Resources; +using BaseResources = Core.Common.Base.Properties.Resources; namespace Ringtoets.Piping.Forms.NodePresenters { @@ -122,11 +123,7 @@ var clearOutputItem = new StrictContextMenuItem(Resources.Clear_output, null, RingtoetsFormsResources.ClearIcon, - (o, args) => - { - calculation.ClearOutput(); - calculation.NotifyObservers(); - }); + (o, args) => ClearOutput(calculation)); if (!calculation.HasOutput) { @@ -151,5 +148,15 @@ .AddPropertiesItem() .Build(); } + + private static void ClearOutput(PipingCalculation calculation) + { + if (MessageBox.Show(Resources.PipingCalculationContextNodePresenter_GetContextMenu_Are_you_sure_clear_output, BaseResources.Confirm, MessageBoxButtons.OKCancel) != DialogResult.OK) + { + return; + } + calculation.ClearOutput(); + calculation.NotifyObservers(); + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs =================================================================== diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r94ad8ac133939b11df035a772cba786e53d7c20d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs (.../PipingOutputNodePresenter.cs) (revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingOutputNodePresenter.cs (.../PipingOutputNodePresenter.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -45,16 +45,9 @@ protected override ContextMenuStrip GetContextMenu(ITreeNode node, PipingOutput nodeData) { - StrictContextMenuItem clearItem = new StrictContextMenuItem( - Resources.Clear_output, - null, - RingtoestFormsResources.ClearIcon, - (s, e) => node.TreeView.TryDeleteSelectedNodeData() - ); - return contextMenuBuilderProvider .Get(node) - .AddCustomItem(clearItem) + .AddDeleteItem() .AddSeparator() .AddExportItem() .AddSeparator() Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r0758a103361e8067e8b56eec6cc28ff0c6eba12f -r94ad8ac133939b11df035a772cba786e53d7c20d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -116,7 +116,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 { @@ -280,6 +280,15 @@ } /// + /// Looks up a localized string similar to Weet u zeker dat u de uitvoer van de berekening wilt wissen?. + /// + public static string PipingCalculationContextNodePresenter_GetContextMenu_Are_you_sure_clear_output { + get { + return ResourceManager.GetString("PipingCalculationContextNodePresenter_GetContextMenu_Are_you_sure_clear_output", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Piping. /// public static string PipingCalculationContextProperties_DisplayName { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r0758a103361e8067e8b56eec6cc28ff0c6eba12f -r94ad8ac133939b11df035a772cba786e53d7c20d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -425,7 +425,7 @@ De berekening heeft geen uitvoer om te wissen. - &Wis uitvoer + &Wis uitvoer... Er zijn geen berekeningen met uitvoer om te wissen. @@ -520,4 +520,7 @@ Valideer alle berekeningen binnen deze berekeningsmap. + + Weet u zeker dat u de uitvoer van de berekening wilt wissen? + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs =================================================================== diff -u -r0758a103361e8067e8b56eec6cc28ff0c6eba12f -r94ad8ac133939b11df035a772cba786e53d7c20d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision 0758a103361e8067e8b56eec6cc28ff0c6eba12f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationContextNodePresenterTest.cs (.../PipingCalculationContextNodePresenterTest.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -9,7 +9,7 @@ using Core.Common.Gui.TestUtil.ContextMenu; using Core.Common.TestUtil; using Core.Common.Utils.Events; - +using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Forms.NodePresenters; @@ -25,7 +25,7 @@ namespace Ringtoets.Piping.Forms.Test.NodePresenters { [TestFixture] - public class PipingCalculationContextNodePresenterTest + public class PipingCalculationContextNodePresenterTest : NUnitFormTest { private MockRepository mockRepository; @@ -833,7 +833,9 @@ } [Test] - public void GivenPipingCalculationWithOutput_WhenClearingOutputFromContextMenu_ThenPipingCalculationOutputClearedAndNotified() + [TestCase(true)] + [TestCase(false)] + public void GivenPipingCalculationWithOutput_WhenClearingOutputFromContextMenu_ThenPipingCalculationOutputClearedAndNotified(bool confirm) { // Given var contextMenuBuilderProviderMock = mockRepository.DynamicMock(); @@ -842,7 +844,10 @@ contextMenuBuilderProviderMock.Expect(cmp => cmp.Get(treeNodeMock)).Return(new CustomItemsOnlyContextMenuBuilder()); int clearOutputItemPosition = 2; - observer.Expect(o => o.UpdateObserver()); + if (confirm) + { + observer.Expect(o => o.UpdateObserver()); + } mockRepository.ReplayAll(); @@ -854,12 +859,26 @@ var contextMenuAdapter = nodePresenter.GetContextMenu(treeNodeMock, new PipingCalculationContext(calculation, Enumerable.Empty(), Enumerable.Empty())); + DialogBoxHandler = (name, wnd) => + { + var messageBox = new MessageBoxTester(wnd); + Assert.AreEqual("Weet u zeker dat u de uitvoer van de berekening wilt wissen?", messageBox.Text); + Assert.AreEqual("Bevestigen", messageBox.Title); + if (confirm) + { + messageBox.ClickOk(); + } + else + { + messageBox.ClickCancel(); + } + }; // When contextMenuAdapter.Items[clearOutputItemPosition].PerformClick(); // Then - Assert.IsFalse(calculation.HasOutput); + Assert.AreNotEqual(confirm, calculation.HasOutput); mockRepository.VerifyAll(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs =================================================================== diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -r94ad8ac133939b11df035a772cba786e53d7c20d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs (.../PipingOutputNodePresenterTest.cs) (revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingOutputNodePresenterTest.cs (.../PipingOutputNodePresenterTest.cs) (revision 94ad8ac133939b11df035a772cba786e53d7c20d) @@ -6,6 +6,7 @@ using Core.Common.Gui.ContextMenu; using Core.Common.Gui.TestUtil.ContextMenu; using Core.Common.TestUtil; +using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Piping.Calculation.TestUtil; @@ -21,7 +22,7 @@ namespace Ringtoets.Piping.Forms.Test.NodePresenters { [TestFixture] - public class PipingOutputNodePresenterTest + public class PipingOutputNodePresenterTest { private MockRepository mockRepository; @@ -208,7 +209,7 @@ var contextMenuBuilderProviderMock = mockRepository.StrictMock(); var menuBuilderMock = mockRepository.StrictMock(); - menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock); + menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); @@ -225,32 +226,6 @@ // Assert mockRepository.VerifyAll(); - } - - [Test] - public void GetContextMenu_ClearItemClicked_OutputCleared() - { - // Setup - var contextMenuBuilderProviderMock = mockRepository.StrictMock(); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var treeMock = mockRepository.StrictMock(); - var nodeMock = mockRepository.StrictMock(); - treeMock.Expect(t => t.TryDeleteSelectedNodeData()); - nodeMock.Expect(n => n.TreeView).Return(treeMock); - - contextMenuBuilderProviderMock.Expect(cmp => cmp.Get(nodeMock)).Return(menuBuilder); - - mockRepository.ReplayAll(); - - var nodePresenter = new PipingOutputNodePresenter(contextMenuBuilderProviderMock); - var contextMenu = nodePresenter.GetContextMenu(nodeMock, new TestPipingOutput()); - - // Call - contextMenu.Items[0].PerformClick(); - - // Assert - mockRepository.VerifyAll(); - } } } \ No newline at end of file