Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -rda4d097a3f50554dda0bb688e187c2be8003de9f -r20faad067faaa4ebf9da5f51a6b278d899c918e7
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision da4d097a3f50554dda0bb688e187c2be8003de9f)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 20faad067faaa4ebf9da5f51a6b278d899c918e7)
@@ -186,13 +186,6 @@
OptionsDialog.cs
-
-
- Form
-
-
- ProgressDialog.cs
-
Component
@@ -349,10 +342,6 @@
ActivityProgressDialog.cs
-
- ProgressDialog.cs
- Designer
-
RichTextView.cs
Designer
Fisheye: Tag 20faad067faaa4ebf9da5f51a6b278d899c918e7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityInfo.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 20faad067faaa4ebf9da5f51a6b278d899c918e7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ProgressDialog.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 20faad067faaa4ebf9da5f51a6b278d899c918e7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ProgressDialog.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 20faad067faaa4ebf9da5f51a6b278d899c918e7 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ProgressDialog.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r5bdfe106fefb36f7e677da7e75afec1eba7eedd3 -r20faad067faaa4ebf9da5f51a6b278d899c918e7
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 5bdfe106fefb36f7e677da7e75afec1eba7eedd3)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision 20faad067faaa4ebf9da5f51a6b278d899c918e7)
@@ -56,7 +56,6 @@
private AvalonDockDockingManager toolWindowViewsDockingManager;
private SplashScreen splashScreen;
- private ProgressDialog progressDialog;
private bool settingSelection;
private bool runFinished;
@@ -493,12 +492,6 @@
DocumentViewsResolver = null;
- if (progressDialog != null)
- {
- progressDialog.Dispose();
- progressDialog = null;
- }
-
splashScreen = null;
MessageWindowLogAppender.MessageWindow = null;
@@ -625,8 +618,6 @@
{
ResumeUI();
}
-
- UpdateProgressDialog();
}
[InvokeRequired]
@@ -641,54 +632,6 @@
MainWindow.PropertyGrid.Data = MainWindow.PropertyGrid.GetObjectProperties(Selection);
}
- private void UpdateProgressDialog()
- {
- //popping a dialog on buildserver causes error
- //Showing a modal dialog box or form when the application is not running in UserInteractive mode is not a valid operation.
- //hence this check
- if (!Environment.UserInteractive)
- {
- return;
- }
-
- if (isExiting)
- {
- return;
- }
-
- if (progressDialog == null || progressDialog.IsDisposed)
- {
- progressDialog = new ProgressDialog();
- progressDialog.CancelClicked += delegate
- {
- ActivityRunner.CancelAll();
-
- // wait until all import activities are finished
- while (ActivityRunner.IsRunning)
- {
- Application.DoEvents();
- }
- };
- progressDialog.Data = ActivityRunner.Activities;
- }
-
- if (ActivityRunner.IsRunning)
- {
- if (!progressDialog.Visible)
- {
- mainWindow.Enabled = false;
- progressDialog.Show(mainWindow);
- progressDialog.CenterToParent();
- }
- }
- else
- {
- mainWindow.Enabled = true;
- progressDialog.Hide();
- progressDialog.Visible = false;
- }
- }
-
private void ApplicationProjectOpened(Project project)
{
ResumeUI();
Index: Core/Common/test/Core.Common.Test/Core.Common.Test.csproj
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r20faad067faaa4ebf9da5f51a6b278d899c918e7
--- Core/Common/test/Core.Common.Test/Core.Common.Test.csproj (.../Core.Common.Test.csproj) (revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Test/Core.Common.Test.csproj (.../Core.Common.Test.csproj) (revision 20faad067faaa4ebf9da5f51a6b278d899c918e7)
@@ -90,7 +90,6 @@
-
Fisheye: Tag 20faad067faaa4ebf9da5f51a6b278d899c918e7 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Gui/Forms/ProgressDialogTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?