Index: Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls.Swf/Core.Common.Controls.Swf.csproj	(.../Core.Common.Controls.Swf.csproj)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -193,7 +193,6 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="IWizardPage.cs" />
-    <Compile Include="ModalHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
Fisheye: Tag 3ede22c08da5f2050eb231137a2c6dd552e1ebdf refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.Swf/ModalHelper.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -424,15 +424,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Hoofdvenster niet geïnjecteerd..
-        /// </summary>
-        internal static string ModalHelper_ShowModal_Main_window_not_injected {
-            get {
-                return ResourceManager.GetString("ModalHelper_ShowModal_Main_window_not_injected", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap page_white {
Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx	(.../Resources.resx)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx	(.../Resources.resx)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -377,9 +377,6 @@
   <data name="TableView_UpdateSelectionFromGridControl_Firing_selection_changed_event" xml:space="preserve">
     <value>SelectionChanged event afgevuurd.</value>
   </data>
-  <data name="ModalHelper_ShowModal_Main_window_not_injected" xml:space="preserve">
-    <value>Hoofdvenster niet geïnjecteerd.</value>
-  </data>
   <data name="FindAndReplaceControl_buttonReplaceAll_Click_Replaced_0_occurrences_of_1_with_2_" xml:space="preserve">
     <value>{0} exemplaren van {1} zijn met {2} vervangen.</value>
   </data>
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -70,20 +70,29 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="Command.cs" />
+    <Compile Include="Dialogs\DialogBase.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Dialogs\DialogBase.Designer.cs">
+      <DependentUpon>DialogBase.cs</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\ExceptionDialog.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Dialogs\ExceptionDialog.Designer.cs">
       <DependentUpon>ExceptionDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\ModalHelper.cs" />
     <Compile Include="DragOperations.cs" />
     <Compile Include="IReusableView.cs" />
     <Compile Include="IView.cs" />
@@ -125,6 +134,9 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Dialogs\DialogBase.resx">
+      <DependentUpon>DialogBase.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Dialogs\ExceptionDialog.resx">
       <DependentUpon>ExceptionDialog.cs</DependentUpon>
     </EmbeddedResource>
Index: Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.Designer.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.Designer.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.Designer.cs	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -0,0 +1,50 @@
+namespace Core.Common.Controls.Dialogs
+{
+    partial class DialogBase
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.SuspendLayout();
+            // 
+            // DialogBase
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(550, 281);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "DialogBase";
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "DialogBase";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.cs	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -0,0 +1,47 @@
+using System.Windows.Forms;
+
+namespace Core.Common.Controls.Dialogs
+{
+    /// <summary>
+    /// Base class for dialogs which should be derived in order to get a consistent look and feel.
+    /// The base class ensures:
+    /// <list type="bullet">
+    /// <item>
+    /// <description>the dialog is shown in the center of the parent form (<see cref="Form.StartPosition"/> is set to <see cref="FormStartPosition.CenterParent"/>);</description>
+    /// </item>
+    /// <item>
+    /// <description>no task bar icon is shown (<see cref="Form.ShowInTaskbar"/> is set to <c>false</c>);</description>
+    /// </item>
+    /// <item>
+    /// <description>no minimize control box item is shown (<see cref="Form.MinimizeBox"/> is set to <c>false</c>);</description>
+    /// </item>
+    /// <item>
+    /// <description>no maximize control box item is shown (<see cref="Form.MaximizeBox"/> is set to <c>false</c>);</description>
+    /// </item>
+    /// <item>
+    /// <description>the parent form is automatically obtained using <see cref="ModalHelper"/>.</description>
+    /// </item>
+    /// </list>
+    /// </summary>
+    public partial class DialogBase : Form
+    {
+        /// <summary>
+        /// Constructs a new <see cref="DialogBase"/>.
+        /// </summary>
+        protected DialogBase()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// This method provides a new implementation of <see cref="Form.ShowDialog()"/>.
+        /// In this new implementation the dialog is shown with an <see cref="IWin32Window"/> owner,
+        /// which is automatically derived via <see cref="ModalHelper"/>.
+        /// </summary>
+        /// <returns>A <see cref="DialogResult"/>.</returns>
+        public new DialogResult ShowDialog()
+        {
+            return base.ShowDialog(ModalHelper.MainWindow);
+        }
+    }
+}
Index: Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.resx
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.resx	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Dialogs/DialogBase.resx	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs	(.../ExceptionDialog.Designer.cs)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.Designer.cs	(.../ExceptionDialog.Designer.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -87,20 +87,15 @@
             // 
             this.AcceptButton = this.buttonRestart;
             resources.ApplyResources(this, "$this");
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.buttonExit;
             this.Controls.Add(this.buttonOpenLog);
             this.Controls.Add(this.buttonExit);
             this.Controls.Add(this.exceptionTextBox);
             this.Controls.Add(this.richTextBox1);
             this.Controls.Add(this.buttonCopyTextToClipboard);
             this.Controls.Add(this.buttonRestart);
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
             this.Name = "ExceptionDialog";
-            this.ShowInTaskbar = false;
             this.ResumeLayout(false);
-
         }
 
         #endregion
Index: Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls/Dialogs/ExceptionDialog.cs	(.../ExceptionDialog.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -7,7 +7,7 @@
 
 namespace Core.Common.Controls.Dialogs
 {
-    public partial class ExceptionDialog : Form
+    public partial class ExceptionDialog : DialogBase
     {
         public event EventHandler RestartClicked;
 
Index: Core/Common/src/Core.Common.Controls/Dialogs/ModalHelper.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Dialogs/ModalHelper.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Dialogs/ModalHelper.cs	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -0,0 +1,37 @@
+using System;
+using System.Windows.Forms;
+using Core.Common.Controls.Properties;
+
+namespace Core.Common.Controls.Dialogs
+{
+    public static class ModalHelper
+    {
+        private static WeakReference mainWindowRef;
+
+        public static IWin32Window MainWindow
+        {
+            get
+            {
+                if (mainWindowRef != null)
+                {
+                    return (IWin32Window) mainWindowRef.Target;
+                }
+                return null;
+            }
+            set
+            {
+                mainWindowRef = value != null ? new WeakReference(value) : null;
+            }
+        }
+
+        public static DialogResult ShowModal(Form f)
+        {
+            if (MainWindow == null)
+            {
+                throw new InvalidOperationException(Resources.ModalHelper_ShowModal_Main_window_not_injected);
+            }
+
+            return f.ShowDialog(MainWindow);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -89,5 +89,14 @@
                 return ResourceManager.GetString("ExceptionDialog_GetExceptionText_Loader_exceptions", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Hoofdvenster niet geïnjecteerd..
+        /// </summary>
+        internal static string ModalHelper_ShowModal_Main_window_not_injected {
+            get {
+                return ResourceManager.GetString("ModalHelper_ShowModal_Main_window_not_injected", resourceCulture);
+            }
+        }
     }
 }
Index: Core/Common/src/Core.Common.Controls/Properties/Resources.resx
===================================================================
diff -u -r12056e0413d731a732ad1098c071f325ba5d632f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Controls/Properties/Resources.resx	(.../Resources.resx)	(revision 12056e0413d731a732ad1098c071f325ba5d632f)
+++ Core/Common/src/Core.Common.Controls/Properties/Resources.resx	(.../Resources.resx)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -129,4 +129,7 @@
     <value>Foutmelding van de loader:
 </value>
   </data>
+  <data name="ModalHelper_ShowModal_Main_window_not_injected" xml:space="preserve">
+    <value>Hoofdvenster niet geïnjecteerd.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r0ea17b610f66d122fd9f0c8ef9db30740be455d8 -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 0ea17b610f66d122fd9f0c8ef9db30740be455d8)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -17,7 +17,7 @@
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 using Core.Common.Controls;
-using Core.Common.Controls.Swf;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Forms.MessageWindow;
 using Core.Common.Gui.Forms.Options;
 using Core.Common.Utils;
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs
===================================================================
diff -u -r343fa44e519ff64bb0d8f8972e08ffcd1b64737f -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 343fa44e519ff64bb0d8f8972e08ffcd1b64737f)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs	(.../MessageWindow.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -5,7 +5,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
-using Core.Common.Controls.Swf;
+using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Properties;
 using log4net.Core;
 
Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs
===================================================================
diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs	(.../ActivityProgressDialogRunner.cs)	(revision 1f79b34c12554e2b9878f6296168d18232cc9852)
+++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialogRunner.cs	(.../ActivityProgressDialogRunner.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Core.Common.Base.Service;
-using Core.Common.Controls.Swf;
+using Core.Common.Controls.Dialogs;
 
 namespace Core.Common.Gui.Forms.ProgressDialog
 {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs
===================================================================
diff -u -r7ca30c36a4c796c39a1137d7f504884d766c6e70 -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs	(.../MapChangeCoordinateSystemCommand.cs)	(revision 7ca30c36a4c796c39a1137d7f504884d766c6e70)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs	(.../MapChangeCoordinateSystemCommand.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
@@ -1,5 +1,5 @@
 using System.Windows.Forms;
-using Core.Common.Controls.Swf;
+using Core.Common.Controls.Dialogs;
 using Core.GIS.SharpMap.CoordinateSystems.Transformations;
 using Core.GIS.SharpMap.Extensions.CoordinateSystems;
 using Core.GIS.SharpMap.UI.Forms;