Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r80ebf3911f46c8fde95702b7723e4457b4fd80ea -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 80ebf3911f46c8fde95702b7723e4457b4fd80ea)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -91,16 +91,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap receipt_text {
- get {
- object obj = ResourceManager.GetObject("receipt_text", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Algemeen.
///
public static string Ringtoets_Category {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r80ebf3911f46c8fde95702b7723e4457b4fd80ea -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 80ebf3911f46c8fde95702b7723e4457b4fd80ea)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -117,10 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- ..\Resources\receipt-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Algemeen
@@ -130,6 +126,7 @@
Kan knoop uit boom van type {0} niet verwijderen.
+
..\Resources\folder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/receipt-text.png
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r279b6419e68e1a68659c8564b8410679a3d9d983
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u -r80ebf3911f46c8fde95702b7723e4457b4fd80ea -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 80ebf3911f46c8fde95702b7723e4457b4fd80ea)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -12,23 +12,6 @@
v4.0
512
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
true
bin\Debug\
@@ -47,15 +30,6 @@
prompt
MinimumRecommendedRules.ruleset
-
- bin\CreateInstallerWithDemoProject\
- TRACE
- true
- pdbonly
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
-
bin\CreateInstallerWithDemoProject\
TRACE
@@ -91,12 +65,10 @@
PublicResXFileCodeGenerator
Resources.Designer.cs
+ Designer
-
-
-
{9a2d67e6-26ac-4d17-b11a-2b4372f2f572}
Core.Common.Controls
Index: Ringtoets/Common/src/Ringtoets.Common.Placeholder/Ringtoets.Common.Placeholder.csproj
===================================================================
diff -u -rfcf04bfe765cc56c90a010b4b4790cab0ac5b2c6 -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Common/src/Ringtoets.Common.Placeholder/Ringtoets.Common.Placeholder.csproj (.../Ringtoets.Common.Placeholder.csproj) (revision fcf04bfe765cc56c90a010b4b4790cab0ac5b2c6)
+++ Ringtoets/Common/src/Ringtoets.Common.Placeholder/Ringtoets.Common.Placeholder.csproj (.../Ringtoets.Common.Placeholder.csproj) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -12,23 +12,6 @@
v4.0
512
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
true
bin\Debug\
@@ -47,15 +30,6 @@
prompt
MinimumRecommendedRules.ruleset
-
- bin\CreateInstallerWithDemoProject\
- TRACE
- true
- pdbonly
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
-
bin\CreateInstallerWithDemoProject\
TRACE
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Extensions/ContextMenuStripExtensionsTest.cs
===================================================================
diff -u -raa5c3620f316831e71797c558a13a0b73a8109df -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Extensions/ContextMenuStripExtensionsTest.cs (.../ContextMenuStripExtensionsTest.cs) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Extensions/ContextMenuStripExtensionsTest.cs (.../ContextMenuStripExtensionsTest.cs) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -21,15 +21,15 @@
const string menuItemsTooltip = "";
// Call
- var newItem = menu.AddMenuItem(menuItemsText, menuItemsTooltip, FormsResources.receipt_text, (sender, args) => callCount++);
+ var newItem = menu.AddMenuItem(menuItemsText, menuItemsTooltip, FormsResources.GeneralFolderIcon, (sender, args) => callCount++);
// Assert
Assert.AreEqual(1, menu.Items.Count);
var addedMenuItem = menu.Items[0];
Assert.AreSame(newItem, addedMenuItem);
Assert.AreEqual(menuItemsText, addedMenuItem.Text);
Assert.AreEqual(menuItemsTooltip, addedMenuItem.ToolTipText);
- Assert.IsNotNull((Image)addedMenuItem.Image);
+ Assert.IsNotNull(addedMenuItem.Image);
addedMenuItem.PerformClick();
Assert.AreEqual(1, callCount);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u -r80ebf3911f46c8fde95702b7723e4457b4fd80ea -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 80ebf3911f46c8fde95702b7723e4457b4fd80ea)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -12,23 +12,6 @@
v4.0
512
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
true
bin\Debug\
@@ -47,15 +30,6 @@
prompt
MinimumRecommendedRules.ruleset
-
- bin\CreateInstallerWithDemoProject\
- TRACE
- true
- pdbonly
- AnyCPU
- prompt
- MinimumRecommendedRules.ruleset
-
bin\CreateInstallerWithDemoProject\
TRACE
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r5f0e26408a7b0a4c86b4525a6f80fc96fdc202f4 -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5f0e26408a7b0a4c86b4525a6f80fc96fdc202f4)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -61,7 +61,7 @@
}
///
- /// Looks up a localized string similar to Kunstwerken - Asfaltbekledingen.
+ /// Looks up a localized string similar to Dijken - Asfaltbekledingen.
///
internal static string AsphaltRevetmentFailureMechanism_DisplayName {
get {
@@ -133,7 +133,7 @@
}
///
- /// Looks up a localized string similar to Kunstwerken - Grasbekledingen.
+ /// Looks up a localized string similar to Dijken - Grasbekledingen.
///
internal static string GrassRevetmentFailureMechanism_DisplayName {
get {
@@ -178,7 +178,7 @@
}
///
- /// Looks up a localized string similar to Kunstwerken - Steenbekledingen.
+ /// Looks up a localized string similar to Dijken - Steenbekledingen.
///
internal static string StoneRevetmentFailureMechanism_DisplayName {
get {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -r5f0e26408a7b0a4c86b4525a6f80fc96fdc202f4 -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 5f0e26408a7b0a4c86b4525a6f80fc96fdc202f4)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -1,103 +1,122 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 1.3
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
Duintraject
@@ -132,12 +151,12 @@
Kunstwerken - Constructief falen
- Kunstwerken - Steenbekledingen
+ Dijken - Steenbekledingen
- Kunstwerken - Asfaltbekledingen
+ Dijken - Asfaltbekledingen
- Kunstwerken - Grasbekledingen
+ Dijken - Grasbekledingen
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs
===================================================================
diff -u -r5c044a6799b45bec77af170dca0a84bc434c5f6f -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs (.../DikeAssessmentSectionTest.cs) (revision 5c044a6799b45bec77af170dca0a84bc434c5f6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs (.../DikeAssessmentSectionTest.cs) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -33,9 +33,9 @@
Assert.AreEqual("Kunstwerken - Overslag en overloop", section.OvertoppingFailureMechanism.Name);
Assert.AreEqual("Kunstwerken - Niet sluiten", section.ClosingFailureMechanism.Name);
Assert.AreEqual("Kunstwerken - Constructief falen", section.FailingOfConstructionFailureMechanism.Name);
- Assert.AreEqual("Kunstwerken - Steenbekledingen", section.StoneRevetmentFailureMechanism.Name);
- Assert.AreEqual("Kunstwerken - Asfaltbekledingen", section.AsphaltRevetmentFailureMechanism.Name);
- Assert.AreEqual("Kunstwerken - Grasbekledingen", section.GrassRevetmentFailureMechanism.Name);
+ Assert.AreEqual("Dijken - Steenbekledingen", section.StoneRevetmentFailureMechanism.Name);
+ Assert.AreEqual("Dijken - Asfaltbekledingen", section.AsphaltRevetmentFailureMechanism.Name);
+ Assert.AreEqual("Dijken - Grasbekledingen", section.GrassRevetmentFailureMechanism.Name);
}
[Test]
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs
===================================================================
diff -u -r0d5ba527995a1b3de4041babb246d675e305d0c1 -r279b6419e68e1a68659c8564b8410679a3d9d983
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs (.../PipingGuiPluginTest.cs) (revision 0d5ba527995a1b3de4041babb246d675e305d0c1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs (.../PipingGuiPluginTest.cs) (revision 279b6419e68e1a68659c8564b8410679a3d9d983)
@@ -23,7 +23,7 @@
public class PipingGuiPluginTest
{
[Test]
- [STAThread] // For creation of XAML UI component
+ [STAThread] // For creation of XAML UI component (PipingRibbon)
public void DefaultConstructor_ExpectedValues()
{
// call