Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rba649bf26cd557bf4788a8b4fa19cf848b36fd87 -re02bad7d2b567bf3871caed72df9ca92baa0ef13
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ba649bf26cd557bf4788a8b4fa19cf848b36fd87)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e02bad7d2b567bf3871caed72df9ca92baa0ef13)
@@ -128,15 +128,6 @@
}
///
- /// Looks up a localized string similar to Assemblage.
- ///
- public static string AssemblyResults_DisplayName {
- get {
- return ResourceManager.GetString("AssemblyResults_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Gecombineerd veiligheidsoordeel.
///
public static string AssemblyResultTotalView_AssemblyResultGroupBox_Text {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u -rba649bf26cd557bf4788a8b4fa19cf848b36fd87 -re02bad7d2b567bf3871caed72df9ca92baa0ef13
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision ba649bf26cd557bf4788a8b4fa19cf848b36fd87)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision e02bad7d2b567bf3871caed72df9ca92baa0ef13)
@@ -309,9 +309,6 @@
Overig ({0})
-
- Assemblage
-
Benaderde faalkans
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 -re02bad7d2b567bf3871caed72df9ca92baa0ef13
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e02bad7d2b567bf3871caed72df9ca92baa0ef13)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
//
// This file is part of Ringtoets.
//
@@ -82,6 +82,33 @@
}
///
+ /// Looks up a localized string similar to Assemblageresultaat.
+ ///
+ public static string AssemblyResult_DisplayName {
+ get {
+ return ResourceManager.GetString("AssemblyResult_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Assemblageresultaat.
+ ///
+ public static string AssemblyResult_file_filter_Description {
+ get {
+ return ResourceManager.GetString("AssemblyResult_file_filter_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to gml.
+ ///
+ public static string AssemblyResult_file_filter_Extension {
+ get {
+ return ResourceManager.GetString("AssemblyResult_file_filter_Extension", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap AssemblyResultPerSection {
@@ -101,6 +128,15 @@
}
///
+ /// Looks up a localized string similar to Assemblage.
+ ///
+ public static string AssemblyResultsCategoryTreeFolder_DisplayName {
+ get {
+ return ResourceManager.GetString("AssemblyResultsCategoryTreeFolder_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap AssemblyResultTotal {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r433fc2ade8570da2d39f3e93ea7ae895cd88fa74 -re02bad7d2b567bf3871caed72df9ca92baa0ef13
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 433fc2ade8570da2d39f3e93ea7ae895cd88fa74)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision e02bad7d2b567bf3871caed72df9ca92baa0ef13)
@@ -212,4 +212,16 @@
Hydraulische belastingen zijn niet samengevoegd omdat het huidige traject meer gegevens bevat.
+
+ gml
+
+
+ Assemblageresultaat
+
+
+ Assemblageresultaat
+
+
+ Assemblage
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -r2cdf3437a976a64fa3f8a0534e5e692f9159f145 -re02bad7d2b567bf3871caed72df9ca92baa0ef13
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 2cdf3437a976a64fa3f8a0534e5e692f9159f145)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision e02bad7d2b567bf3871caed72df9ca92baa0ef13)
@@ -694,11 +694,11 @@
yield return new ExportInfo
{
- Name = RingtoetsFormsResources.AssemblyResults_DisplayName,
+ Name = Resources.AssemblyResult_DisplayName,
CreateFileExporter = (context, filePath) => new AssemblyExporter(context.WrappedData, filePath),
IsEnabled = context => context.WrappedData.ReferenceLine != null,
- FileFilterGenerator = new FileFilterGenerator("gml",
- "gml file")
+ FileFilterGenerator = new FileFilterGenerator(Resources.AssemblyResult_file_filter_Extension,
+ Resources.AssemblyResult_file_filter_Description)
};
}
@@ -1093,7 +1093,7 @@
yield return new TreeNodeInfo
{
- Text = context => RingtoetsFormsResources.AssemblyResults_DisplayName,
+ Text = context => Resources.AssemblyResultsCategoryTreeFolder_DisplayName,
Image = context => RingtoetsCommonFormsResources.GeneralFolderIcon,
ChildNodeObjects = AssemblyResultsContextChildNodeObjects,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs
===================================================================
diff -u -r2cdf3437a976a64fa3f8a0534e5e692f9159f145 -re02bad7d2b567bf3871caed72df9ca92baa0ef13
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs (.../AssemblyResultsContextExportInfoTest.cs) (revision 2cdf3437a976a64fa3f8a0534e5e692f9159f145)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/AssemblyResultsContextExportInfoTest.cs (.../AssemblyResultsContextExportInfoTest.cs) (revision e02bad7d2b567bf3871caed72df9ca92baa0ef13)
@@ -49,7 +49,7 @@
// Assert
Assert.IsNotNull(info.CreateFileExporter);
Assert.IsNotNull(info.IsEnabled);
- Assert.AreEqual("Assemblage", info.Name);
+ Assert.AreEqual("Assemblageresultaat", info.Name);
Assert.AreEqual("Algemeen", info.Category);
TestHelper.AssertImagesAreEqual(CoreCommonGuiResources.ExportIcon, info.Image);
Assert.IsNotNull(info.FileFilterGenerator);
@@ -90,7 +90,7 @@
FileFilterGenerator fileFilterGenerator = info.FileFilterGenerator;
// Assert
- Assert.AreEqual("gml file (*.gml)|*.gml", fileFilterGenerator.Filter);
+ Assert.AreEqual("Assemblageresultaat (*.gml)|*.gml", fileFilterGenerator.Filter);
}
}