Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs
===================================================================
diff -u -r2805d688f1737a0f33a3ed8b112ea7254ff3de87 -r8e42df9f0d1e647da23c12d02932efe41691a15c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 2805d688f1737a0f33a3ed8b112ea7254ff3de87)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Merge/AssessmentSectionMergeDataProviderDialog.cs (.../AssessmentSectionMergeDataProviderDialog.cs) (revision 8e42df9f0d1e647da23c12d02932efe41691a15c)
@@ -5,6 +5,7 @@
using Core.Common.Controls.Dialogs;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
@@ -56,17 +57,26 @@
private void InitializeDataGridView()
{
- dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.IsSelected), "Selecteer");
- dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismMergeDataRow.Name), "Toetsspoor", true);
- dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.IsRelevant), "Is relevant", true);
- dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.HasSections), "Heeft vakindeling", true);
- dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismMergeDataRow.NumberOfCalculations), "Aantal berekeningen", true);
+ dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.IsSelected),
+ Resources.FailureMechanismMergeDataRow_IsSelected_DisplayName);
+ dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismMergeDataRow.Name),
+ Resources.FailureMechanism_Name_DisplayName,
+ true);
+ dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.IsRelevant),
+ Resources.FailureMechanismMergeDataRow_IsRelevant_DisplayName,
+ true);
+ dataGridViewControl.AddCheckBoxColumn(nameof(FailureMechanismMergeDataRow.HasSections),
+ Resources.FailureMechanismMergeDataRow_HasSections_DisplayName,
+ true);
+ dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismMergeDataRow.NumberOfCalculations),
+ Resources.FailureMechanismMergeDataRow_NumberOfCalculations_DisplayName,
+ true);
}
private void InitializeTooltip()
{
infoIcon.BackgroundImage = CoreCommonGuiResources.information;
- toolTip.SetToolTip(infoIcon, "Hydraulische belastingen op trajectniveau worden altijd samengevoegd. Daarbij gaan de huidige berekeningsresultaten voor belastingen op trajectniveau niet verloren.");
+ toolTip.SetToolTip(infoIcon, Resources.AssessmentSectionMergeDataProviderDialog_InfoToolTip);
}
#region Data Setters
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57 -r8e42df9f0d1e647da23c12d02932efe41691a15c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8e42df9f0d1e647da23c12d02932efe41691a15c)
@@ -1,25 +1,4 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
-//
-// This file is part of Ringtoets.
-//
-// Ringtoets is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
//
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
@@ -315,6 +294,15 @@
}
///
+ /// Looks up a localized string similar to Hydraulische belastingen op trajectniveau worden altijd samengevoegd. Daarbij gaan de huidige berekeningsresultaten voor belastingen op trajectniveau niet verloren..
+ ///
+ public static string AssessmentSectionMergeDataProviderDialog_InfoToolTip {
+ get {
+ return ResourceManager.GetString("AssessmentSectionMergeDataProviderDialog_InfoToolTip", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Geeft aan of de geselecteerde achtergrond kaartlaag in alle kaarten van dit traject wordt weergegeven..
///
public static string BackgroundDataProperties_IsVisible_Description {
@@ -488,6 +476,15 @@
}
///
+ /// Looks up a localized string similar to Toetsspoor.
+ ///
+ public static string FailureMechanism_Name_DisplayName {
+ get {
+ return ResourceManager.GetString("FailureMechanism_Name_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Categoriegrenzen voor dit traject.
///
public static string FailureMechanismAssemblyCategories_DisplayName {
@@ -527,15 +524,6 @@
}
///
- /// Looks up a localized string similar to Toetsspoor.
- ///
- public static string FailureMechanismContributionView_GridColumn_Assessment {
- get {
- return ResourceManager.GetString("FailureMechanismContributionView_GridColumn_Assessment", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Toegestane bijdrage aan faalkans [%].
///
public static string FailureMechanismContributionView_GridColumn_Contribution {
@@ -582,6 +570,42 @@
}
///
+ /// Looks up a localized string similar to Heeft vakindeling.
+ ///
+ public static string FailureMechanismMergeDataRow_HasSections_DisplayName {
+ get {
+ return ResourceManager.GetString("FailureMechanismMergeDataRow_HasSections_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Is relevant.
+ ///
+ public static string FailureMechanismMergeDataRow_IsRelevant_DisplayName {
+ get {
+ return ResourceManager.GetString("FailureMechanismMergeDataRow_IsRelevant_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Selecteer.
+ ///
+ public static string FailureMechanismMergeDataRow_IsSelected_DisplayName {
+ get {
+ return ResourceManager.GetString("FailureMechanismMergeDataRow_IsSelected_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Aantal berekeningen.
+ ///
+ public static string FailureMechanismMergeDataRow_NumberOfCalculations_DisplayName {
+ get {
+ return ResourceManager.GetString("FailureMechanismMergeDataRow_NumberOfCalculations_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Overig ({0}).
///
public static string FailureMechanismProperties_Contribution_Other_Percentage_0 {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -r1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57 -r8e42df9f0d1e647da23c12d02932efe41691a15c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1eb7e7ef92a8a08a227ce81e75a2ac95df4b3b57)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8e42df9f0d1e647da23c12d02932efe41691a15c)
@@ -339,7 +339,7 @@
Groepen 3 en 4
-
+
Toetsspoor
@@ -378,4 +378,19 @@
Categoriegrenzen per vak
+
+ Heeft vakindeling
+
+
+ Aantal berekeningen
+
+
+ Selecteer
+
+
+ Is relevant
+
+
+ Hydraulische belastingen op trajectniveau worden altijd samengevoegd. Daarbij gaan de huidige berekeningsresultaten voor belastingen op trajectniveau niet verloren.
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs
===================================================================
diff -u -r0d4d9548637cbf814359cece7b551ca85b8378c3 -r8e42df9f0d1e647da23c12d02932efe41691a15c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 0d4d9548637cbf814359cece7b551ca85b8378c3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssemblyResultTotalView.cs (.../AssemblyResultTotalView.cs) (revision 8e42df9f0d1e647da23c12d02932efe41691a15c)
@@ -122,7 +122,7 @@
private void InitializeDataGridView()
{
dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.Name),
- Resources.FailureMechanismContributionView_GridColumn_Assessment,
+ Resources.FailureMechanism_Name_DisplayName,
true);
dataGridViewControl.AddTextBoxColumn(nameof(FailureMechanismAssemblyResultRowBase.Code),
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r37a6f89101a0da3b109a364c8d705ae67e56a9c5 -r8e42df9f0d1e647da23c12d02932efe41691a15c
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision 37a6f89101a0da3b109a364c8d705ae67e56a9c5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs (.../FailureMechanismContributionView.cs) (revision 8e42df9f0d1e647da23c12d02932efe41691a15c)
@@ -232,7 +232,7 @@
Resources.FailureMechanismContributionView_GridColumn_RelevancyFilter);
probabilityDistributionGrid.AddTextBoxColumn(nameof(FailureMechanismContributionItemRow.Assessment),
- Resources.FailureMechanismContributionView_GridColumn_Assessment,
+ Resources.FailureMechanism_Name_DisplayName,
true);
probabilityDistributionGrid.AddTextBoxColumn(nameof(FailureMechanismContributionItemRow.Code),