Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs =================================================================== diff -u -r391 -r405 --- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 391) +++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs (.../DSoilModelPlugin.cs) (revision 405) @@ -275,6 +275,9 @@ mainForm.ProjectIsSaved(""); BindSupport.Assign(pluginPanel, this); + + SetApplicationIcon(); + ConfigureSoilMechanisms(); // by loading the settings dialog here, we can prevent it from showing the units tab page (temporary for WTI) @@ -428,6 +431,22 @@ } } + private void SetApplicationIcon() + { + try + { + var icon = new System.Drawing.Icon(this.GetType().Assembly.GetManifestResourceStream( + "Deltares.DSoilModel.Forms.Resources.D-SoilModel.ico")); + this.mainForm.UseIcon(icon); + } + catch (Exception) + { + // Kill exception for Windows XP if load fails + // Todo: Solve exception; see MWDAM-391 + } + } + + private void EnableSoilUserFilterForMaterialTable(bool enable) { materialsTable.AllowUserColumnFilterEdit = enable; Index: src/Deltares.DSoilModel.Forms/D-SoilModel.ico =================================================================== diff -u -r6 -r405 Binary files differ Index: src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj =================================================================== diff -u -r389 -r405 --- src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj (.../Deltares.DSoilModel.Forms.csproj) (revision 389) +++ src/Deltares.DSoilModel.Forms/Deltares.DSoilModel.Forms.csproj (.../Deltares.DSoilModel.Forms.csproj) (revision 405) @@ -367,9 +367,9 @@ - + PreserveNewest - + Index: src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj =================================================================== diff -u -r404 -r405 --- src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj (.../Deltares.DSoilModel.Application.csproj) (revision 404) +++ src/Deltares.DSoilModel.Application/Deltares.DSoilModel.Application.csproj (.../Deltares.DSoilModel.Application.csproj) (revision 405) @@ -148,9 +148,9 @@ icuuc30.dll PreserveNewest - + PreserveNewest - +