Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs
===================================================================
diff -u -r860e9e6db2d492ba8f50993af49f9e6b2cffeac1 -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 860e9e6db2d492ba8f50993af49f9e6b2cffeac1)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -179,12 +179,22 @@
}
///
- /// Looks up a localized string similar to {0} van {1}.
+ /// Looks up a localized string similar to {0} - {1} van {2}.
///
- internal static string FileImportActivity_ImportFromFile_CurrentProgress_0_of_TotalProgress_1_ {
+ internal static string FileImportActivity_ImportFromFile_ProgressText_0_CurrentProgress_1_of_TotalProgress_2 {
get {
- return ResourceManager.GetString("FileImportActivity_ImportFromFile_CurrentProgress_0_of_TotalProgress_1_", resourceCulture);
+ return ResourceManager.GetString("FileImportActivity_ImportFromFile_ProgressText_0_CurrentProgress_1_of_TotalProgre" +
+ "ss_2", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to Importeren {0}.
+ ///
+ internal static string FileImportActivity_Name_Import_using_importer_with_name_0 {
+ get {
+ return ResourceManager.GetString("FileImportActivity_Name_Import_using_importer_with_name_0", resourceCulture);
+ }
+ }
}
}
Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx
===================================================================
diff -u -r860e9e6db2d492ba8f50993af49f9e6b2cffeac1 -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 860e9e6db2d492ba8f50993af49f9e6b2cffeac1)
+++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -153,10 +153,13 @@
Opschonen van {0} is mislukt.
-
- {0} van {1}
+
+ {0} - {1} van {2}
Uitvoeren activiteit {0}.
+
+ Importeren {0}
+
\ No newline at end of file
Index: Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs
===================================================================
diff -u -r4f50d51f0faba8e846bbaedcf64e39a814b8d975 -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision 4f50d51f0faba8e846bbaedcf64e39a814b8d975)
+++ Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -11,7 +11,6 @@
private readonly object target;
private readonly IFileImporter importer;
private bool shouldCancel;
- private string progressText;
///
/// One Activity (thread) for a serial file import.
@@ -58,7 +57,6 @@
if (Files == null)
{
ImportFromFile(null);
- Name = importer.Name; // changed during progress
}
else
{
@@ -88,21 +86,24 @@
protected override void OnFinish() {}
+ public override string Name
+ {
+ get
+ {
+ return string.Format(Resources.FileImportActivity_Name_Import_using_importer_with_name_0, importer.Name.ToLower());
+ }
+ }
+
private void ImportFromFile(string fileName)
{
if (shouldCancel)
{
return;
}
- Name = importer.Name;
-
importer.ProgressChanged = (currentStepName, currentStep, totalSteps) =>
{
- Name = string.Format("{0} - {1}", importer.Name, currentStepName);
- progressText = string.Format(Resources.FileImportActivity_ImportFromFile_CurrentProgress_0_of_TotalProgress_1_, currentStep, totalSteps);
-
- SetProgressText(progressText);
+ SetProgressText(string.Format(Resources.FileImportActivity_ImportFromFile_ProgressText_0_CurrentProgress_1_of_TotalProgress_2, currentStepName, currentStep, totalSteps));
};
var item = importer.ImportItem(fileName, target);
Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs
===================================================================
diff -u -rda4d097a3f50554dda0bb688e187c2be8003de9f -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision da4d097a3f50554dda0bb688e187c2be8003de9f)
+++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -44,7 +44,7 @@
progressReporter.ReportProgress(() =>
{
// Update the activity description label
- labelActivityDescription.Text = string.Format(Resources.ActivityProgressDialog_OnShown_Executing_activity_with_name_0, runningActivity.Name);
+ labelActivityDescription.Text = string.Format(runningActivity.Name);
// Update the visibility of the activity progress text related controls
pictureBoxActivityProgressText.Visible = false;
@@ -116,14 +116,22 @@
private void ActivityOnProgressChanged(object sender, EventArgs e)
{
+ var activity = sender as IActivity;
+ if (activity == null)
+ {
+ return;
+ }
+
progressReporter.ReportProgress(() =>
{
+ var progressTextNullOrEmpty = string.IsNullOrEmpty(activity.ProgressText);
+
// Update the visibility of the activity progress text related controls
- pictureBoxActivityProgressText.Visible = true;
- labelActivityProgressText.Visible = true;
+ pictureBoxActivityProgressText.Visible = !progressTextNullOrEmpty;
+ labelActivityProgressText.Visible = !progressTextNullOrEmpty;
// Update the activity progress text label
- labelActivityProgressText.Text = string.Format(((IActivity) sender).ProgressText);
+ labelActivityProgressText.Text = progressTextNullOrEmpty ? "" : activity.ProgressText;
});
}
}
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -rda4d097a3f50554dda0bb688e187c2be8003de9f -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision da4d097a3f50554dda0bb688e187c2be8003de9f)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -89,15 +89,6 @@
}
///
- /// Looks up a localized string similar to Uitvoeren '{0}'.
- ///
- public static string ActivityProgressDialog_OnShown_Executing_activity_with_name_0 {
- get {
- return ResourceManager.GetString("ActivityProgressDialog_OnShown_Executing_activity_with_name_0", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Stap {0} van {1}.
///
public static string ActivityProgressDialog_OnShown_Executing_step_0_of_1 {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -rda4d097a3f50554dda0bb688e187c2be8003de9f -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision da4d097a3f50554dda0bb688e187c2be8003de9f)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -881,9 +881,6 @@
..\Resources\Busy indicator.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- Uitvoeren '{0}'
-
Stap {0} van {1}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r6b3d2269de35bec503bbd3965ae9b532e1c6f216 -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6b3d2269de35bec503bbd3965ae9b532e1c6f216)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.18063
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -70,7 +70,7 @@
}
///
- /// Looks up a localized string similar to Geïmporteerde data toevoegen aan faalmechanisme....
+ /// Looks up a localized string similar to Geïmporteerde data toevoegen aan faalmechanisme.
///
public static string PipingSoilProfilesImporter_Adding_imported_data_to_model {
get {
@@ -97,7 +97,7 @@
}
///
- /// Looks up a localized string similar to Inlezen van de D-Soil Model database....
+ /// Looks up a localized string similar to Inlezen van de D-Soil Model database.
///
public static string PipingSoilProfilesImporter_Reading_database {
get {
@@ -106,7 +106,7 @@
}
///
- /// Looks up a localized string similar to Inlezen van de ondergrondschematisering uit de D-Soil Model database....
+ /// Looks up a localized string similar to Inlezen van de ondergrondschematisering uit de D-Soil Model database.
///
public static string PipingSoilProfilesImporter_ReadingSoilProfiles {
get {
@@ -124,7 +124,7 @@
}
///
- /// Looks up a localized string similar to Geïmporteerde data toevoegen aan faalmechanisme....
+ /// Looks up a localized string similar to Geïmporteerde data toevoegen aan faalmechanisme.
///
public static string PipingSurfaceLinesCsvImporter_Adding_imported_data_to_model {
get {
@@ -151,7 +151,7 @@
}
///
- /// Looks up a localized string similar to Inlezen {0}....
+ /// Looks up a localized string similar to Inlezen {0}.
///
public static string PipingSurfaceLinesCsvImporter_Read_PipingSurfaceLines_0_ {
get {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx
===================================================================
diff -u -r6b3d2269de35bec503bbd3965ae9b532e1c6f216 -r46a0af591207211cdc9949098422b9ce9e87c0ac
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 6b3d2269de35bec503bbd3965ae9b532e1c6f216)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 46a0af591207211cdc9949098422b9ce9e87c0ac)
@@ -124,13 +124,13 @@
DSoilModel bestand
- Geïmporteerde data toevoegen aan faalmechanisme...
+ Geïmporteerde data toevoegen aan faalmechanisme
Profielmetingen importeren afgebroken. Geen data ingelezen.
- Inlezen {0}...
+ Inlezen '{0}'
Er is een fout opgetreden tijdens het inlezen van '{0}' waardoor import niet uitgevoerd kan worden: {1}
@@ -139,13 +139,13 @@
Er is een leesfout opgetreden bij profielmeting {1} van bestand '{0}' en is overgeslagen: {2}
- Geïmporteerde data toevoegen aan faalmechanisme...
+ Geïmporteerde data toevoegen aan faalmechanisme
Ondergrondschematiseringen importeren afgebroken. Geen data ingelezen.
- Inlezen van de D-Soil Model database...
+ Inlezen van de D-Soil Model database
Er is een fout opgetreden tijdens het inlezen van '{0}' waardoor import niet uitgevoerd kan worden: {1}
@@ -154,6 +154,6 @@
Er is een leesfout opgetreden bij ondergrondschematisering van bestand '{0}' en is overgeslagen: {1}
- Inlezen van de ondergrondschematisering uit de D-Soil Model database...
+ Inlezen van de ondergrondschematisering uit de D-Soil Model database
\ No newline at end of file