Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rf00434c244ccdc4e04d1f23d7c8531aad377a8cf -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f00434c244ccdc4e04d1f23d7c8531aad377a8cf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -384,18 +384,18 @@
///
/// Looks up a localized string similar to Er zijn geen berekeningen om uit te voeren..
///
- public static string CalculationGroup_CalculateAll_No_calculations_to_run {
+ public static string CalculationGroup_Calculate_All_No_calculations_to_run {
get {
- return ResourceManager.GetString("CalculationGroup_CalculateAll_No_calculations_to_run", resourceCulture);
+ return ResourceManager.GetString("CalculationGroup_Calculate_All_No_calculations_to_run", resourceCulture);
}
}
///
/// Looks up a localized string similar to Voer alle berekeningen binnen deze map met berekeningen uit..
///
- public static string CalculationGroup_CalculateAll_ToolTip {
+ public static string CalculationGroup_Calculate_All_ToolTip {
get {
- return ResourceManager.GetString("CalculationGroup_CalculateAll_ToolTip", resourceCulture);
+ return ResourceManager.GetString("CalculationGroup_Calculate_All_ToolTip", resourceCulture);
}
}
@@ -1020,7 +1020,7 @@
}
///
- /// Looks up a localized string similar to Alle toetspeilen berekenen..
+ /// Looks up a localized string similar to Alle waterstanden berekenen..
///
public static string DesignWaterLevel_Calculate_All_ToolTip {
get {
@@ -3865,7 +3865,7 @@
}
///
- /// Looks up a localized string similar to Alle golfhoogtes berekenen..
+ /// Looks up a localized string similar to Alle golfhoogten berekenen..
///
public static string WaveHeight_Calculate_All_ToolTip {
get {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rf00434c244ccdc4e04d1f23d7c8531aad377a8cf -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision f00434c244ccdc4e04d1f23d7c8531aad377a8cf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -139,10 +139,10 @@
Alles be&rekenen
-
+
Voer alle berekeningen binnen deze map met berekeningen uit.
-
+
Er zijn geen berekeningen om uit te voeren.
@@ -164,10 +164,10 @@
Voer alle berekeningen binnen dit toetsspoor uit.
- Alle toetspeilen berekenen.
+ Alle waterstanden berekenen.
- Alle golfhoogtes berekenen.
+ Alle golfhoogten berekenen.
Wis de uitvoer van alle berekeningen binnen dit toetsspoor.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs
===================================================================
diff -u -rf00434c244ccdc4e04d1f23d7c8531aad377a8cf -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision f00434c244ccdc4e04d1f23d7c8531aad377a8cf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/TreeNodeInfos/RingtoetsContextMenuItemFactory.cs (.../RingtoetsContextMenuItemFactory.cs) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -119,14 +119,14 @@
{
var menuItem = new StrictContextMenuItem(
Resources.Calculate_All,
- Resources.CalculationGroup_CalculateAll_ToolTip,
+ Resources.CalculationGroup_Calculate_All_ToolTip,
Resources.CalculateAllIcon,
(o, args) => calculateAllAction(calculationGroup, calculationGroupContext));
if (!calculationGroupContext.WrappedData.GetCalculations().Any())
{
menuItem.Enabled = false;
- menuItem.ToolTipText = Resources.CalculationGroup_CalculateAll_No_calculations_to_run;
+ menuItem.ToolTipText = Resources.CalculationGroup_Calculate_All_No_calculations_to_run;
}
else
{
@@ -310,6 +310,7 @@
clearAllItem.Enabled = false;
clearAllItem.ToolTipText = Resources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear;
}
+
return clearAllItem;
}
@@ -480,8 +481,8 @@
var contextMenuEnabled = true;
string toolTipMessage = Resources.CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreProfile_ToolTip;
ICalculation[] calculationsToUpdate = calculations
- .Where(c => c.InputParameters.ForeshoreProfile != null && !c.InputParameters.IsForeshoreProfileInputSynchronized)
- .ToArray();
+ .Where(c => c.InputParameters.ForeshoreProfile != null && !c.InputParameters.IsForeshoreProfileInputSynchronized)
+ .ToArray();
if (!calculationsToUpdate.Any())
{
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rc4785264e7bca51dafd7ed61a65a17e66daef9c1 -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c4785264e7bca51dafd7ed61a65a17e66daef9c1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -91,15 +91,6 @@
}
///
- /// Looks up a localized string similar to Alle golfhoogtes bij doorsnede-eis berekenen..
- ///
- public static string GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip {
- get {
- return ResourceManager.GetString("GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Is convergentie bereikt in de berekening van de waterstand bij doorsnede-eis?.
///
public static string GrassCoverErosionOutwardsDesignWaterLevelCalculation_Convergence_Description {
@@ -139,24 +130,6 @@
}
///
- /// Looks up a localized string similar to Alles be&rekenen.
- ///
- public static string GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All {
- get {
- return ResourceManager.GetString("GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Alle waterstanden bij doorsnede-eis berekenen..
- ///
- public static string GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All_ToolTip {
- get {
- return ResourceManager.GetString("GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All_ToolTip", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Gras.
///
public static string GrassCoverErosionOutwardsWaveConditionsInputContext_RevetmentType {
@@ -288,15 +261,6 @@
}
///
- /// Looks up a localized string similar to Golfhoogte bij doorsnede-eis.
- ///
- public static string MetaData_WaveHeight {
- get {
- return ResourceManager.GetString("MetaData_WaveHeight", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Hs(Vv->VIv).
///
public static string MetaData_WaveHeightCalculationForFactorizedLowerLimitNorm {
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx
===================================================================
diff -u -rc4785264e7bca51dafd7ed61a65a17e66daef9c1 -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision c4785264e7bca51dafd7ed61a65a17e66daef9c1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -117,12 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Alles be&rekenen
-
-
- Alle waterstanden bij doorsnede-eis berekenen.
-
Berekende waterstand bij doorsnede-eis.
@@ -132,9 +126,6 @@
Is convergentie bereikt in de berekening van de waterstand bij doorsnede-eis?
-
- Alle golfhoogtes bij doorsnede-eis berekenen.
-
Is convergentie bereikt in de berekening van de golfhoogte bij doorsnede-eis?
@@ -165,9 +156,6 @@
Waterstand bij doorsnede-eis
-
- Golfhoogte bij doorsnede-eis
-
Als u deze parameter wijzigt, zal de uitvoer van alle randvoorwaarden locaties en berekeningen in dit toetsspoor verwijderd worden.
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -reebbc3b7f6370ec49ab77281034fab75b676c66f -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision eebbc3b7f6370ec49ab77281034fab75b676c66f)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -555,8 +555,8 @@
TreeViewControl treeViewControl)
{
var designWaterLevelItem = new StrictContextMenuItem(
- RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All,
- RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsWaterLevelLocation_Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.Calculate_All,
+ RingtoetsCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
@@ -599,7 +599,7 @@
{
var waveHeightItem = new StrictContextMenuItem(
RingtoetsCommonFormsResources.Calculate_All,
- RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwards_WaveHeight_Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
@@ -992,7 +992,7 @@
var waveHeightItem = new StrictContextMenuItem(
RingtoetsCommonFormsResources.Calculate_All,
- RingtoetsCommonFormsResources.Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.DesignWaterLevel_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
@@ -1101,7 +1101,7 @@
var waveHeightItem = new StrictContextMenuItem(
RingtoetsCommonFormsResources.Calculate_All,
- RingtoetsCommonFormsResources.Calculate_All_ToolTip,
+ RingtoetsCommonFormsResources.WaveHeight_Calculate_All_ToolTip,
RingtoetsCommonFormsResources.CalculateAllIcon,
(sender, args) =>
{
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r374efe50d0e77c3cb586d5990e296b41fea97e40 -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 374efe50d0e77c3cb586d5990e296b41fea97e40)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -263,10 +263,6 @@
{C8383B76-B3F1-4E6E-B56C-527B469FA20A}
Ringtoets.Integration.Plugin
-
- {28811C4A-6C18-42C1-88B2-A03A3784E2D0}
- Ringtoets.Integration.Service
-
{174BA68D-6176-4AC5-8DFD-98CDD2C4D971}
Ringtoets.Integration.TestUtil
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj
===================================================================
diff -u -rd3b14a0f327184e0239e5239c826805c565fe8be -r4376a372caaaeb42bf19c90fbf1cc012e56766ea
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj (.../Ringtoets.Integration.Service.Test.csproj) (revision d3b14a0f327184e0239e5239c826805c565fe8be)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Ringtoets.Integration.Service.Test.csproj (.../Ringtoets.Integration.Service.Test.csproj) (revision 4376a372caaaeb42bf19c90fbf1cc012e56766ea)
@@ -69,10 +69,6 @@
{D1234D03-76BC-437D-B941-DFF14A2A108D}
Ringtoets.GrassCoverErosionOutwards.Data.TestUtil
-
- {C700ED66-8565-48B2-9A4E-B0D33FB2B26D}
- Ringtoets.GrassCoverErosionOutwards.Util.TestUtil
-
{1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}
Ringtoets.HeightStructures.Data
@@ -122,9 +118,7 @@
Ringtoets.Integration.TestUtil
-
-
-
+