Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r652 -r654
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 652)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 654)
@@ -495,5 +495,14 @@
Assert.AreEqual(false, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
}
+
+ [Test]
+ public void HideImportOldDatabaseCommand()
+ {
+ var context = new DSoilModelContext();
+ var plugin = new DSoilModelPlugin();
+
+ Assert.AreEqual(false, context.IsVisible(plugin, "OldProjectImport"));
+ }
}
}
Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r652 -r654
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 652)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 654)
@@ -139,6 +139,7 @@
if (source is MainForm)
{
+ Console.WriteLine("Mainform: " + member);
// hide units command from tools menu
if (member == "SelectUnits")
{
@@ -300,6 +301,13 @@
return false;
}
}
+
+ // hide import of old project database (Geobase), see DSB-715
+ if (source is DSoilModelPlugin && member == "OldProjectImport")
+ {
+ return false;
+ }
+
return base.IsVisible(source, member);
}
Index: src/Deltares.DSoilModel.Forms/Translations.xml
===================================================================
diff -u -r631 -r654
--- src/Deltares.DSoilModel.Forms/Translations.xml (.../Translations.xml) (revision 631)
+++ src/Deltares.DSoilModel.Forms/Translations.xml (.../Translations.xml) (revision 654)
@@ -25,7 +25,7 @@
-
+
Index: data/D-Soil Model/Groot Salland.gdb
===================================================================
diff -u -r25 -r654
Binary files differ
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r641 -r654
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 641)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 654)
@@ -1493,7 +1493,7 @@
FileName = "",
CheckFileExists = true,
CheckPathExists = true,
- Filter = "Soil database (access)|*.mdb|Geobase database (Firebird)|*.gdb"
+ Filter = "MSoilbase or MGeobase database(*.mdb, *.gdb)|*.mdb;*.gdb"
};
openDialog.FileName = "soilmaterials.mdb";
openDialog.FilterIndex = 0;