Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r8facffc48a20cd49759e32aea1ecc100047c68a2 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 8facffc48a20cd49759e32aea1ecc100047c68a2)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -69,7 +69,7 @@
private static readonly ILog log = LogManager.GetLogger(typeof(App));
- private static RingtoetsGui gui;
+ private static GuiCore gui;
private static int waitForProcessId = -1;
private static string fileToOpen = String.Empty;
@@ -153,7 +153,7 @@
ManualFilePath = "Ringtoets_Manual.pdf"
};
var mainWindow = new MainWindow();
- gui = new RingtoetsGui(mainWindow, new StorageSqLite(), applicationCore, settings)
+ gui = new GuiCore(mainWindow, new StorageSqLite(), applicationCore, settings)
{
Plugins =
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r295ad67e03b81842c18b7688a4c80ab410ddd6d1 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 295ad67e03b81842c18b7688a4c80ab410ddd6d1)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -110,7 +110,7 @@
var testFile = Path.Combine(testDataPath, "ValidRingtoetsDatabase.rtd");
var projectStore = new StorageSqLite();
- using (var gui = new RingtoetsGui(new MainWindow(), projectStore, new ApplicationCore(), new GuiCoreSettings()))
+ using (var gui = new GuiCore(new MainWindow(), projectStore, new ApplicationCore(), new GuiCoreSettings()))
{
// Call
Action action = () => gui.Run(testFile);
@@ -138,7 +138,7 @@
var testFile = "SomeFile";
var projectStore = new StorageSqLite();
- using (var gui = new RingtoetsGui(new MainWindow(), projectStore, new ApplicationCore(), new GuiCoreSettings()))
+ using (var gui = new GuiCore(new MainWindow(), projectStore, new ApplicationCore(), new GuiCoreSettings()))
{
// Call
Action action = () => gui.Run(testFile);
@@ -170,7 +170,7 @@
// Setup
var projectStore = new StorageSqLite();
- using (var gui = new RingtoetsGui(new MainWindow(), projectStore, new ApplicationCore(), new GuiCoreSettings()))
+ using (var gui = new GuiCore(new MainWindow(), projectStore, new ApplicationCore(), new GuiCoreSettings()))
{
// Call
Action action = () => gui.Run(testFile);
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r5c6c1168c657e4be77fa2e7a2f3ed906675a1d9c -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 5c6c1168c657e4be77fa2e7a2f3ed906675a1d9c)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -161,7 +161,7 @@
-
+
@@ -183,7 +183,7 @@
-
+
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs (.../IMainWindow.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/IMainWindow.cs (.../IMainWindow.cs) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -19,7 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System;
using System.Windows.Forms;
using Core.Common.Gui.Forms.MessageWindow;
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml
===================================================================
diff -u -rbffa029f6badebf2eb97472a50a7c305c8fb2ae5 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision bffa029f6badebf2eb97472a50a7c305c8fb2ae5)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -160,7 +160,7 @@
-
+
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r8facffc48a20cd49759e32aea1ecc100047c68a2 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 8facffc48a20cd49759e32aea1ecc100047c68a2)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -604,8 +604,6 @@
}
}
- private void OnLayoutRootPropertyChanged(object sender, PropertyChangedEventArgs e) {}
-
private void UpdateToolWindowButtonState()
{
if (toolViewController.ToolWindowViews != null)
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.cs (.../MessageWindowDialog.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowDialog.cs (.../MessageWindowDialog.cs) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -26,14 +26,14 @@
namespace Core.Common.Gui.Forms.MessageWindow
{
///
- /// Class for showing a message dialog.
+ /// Dialog for showing a particular message.
///
public partial class MessageWindowDialog : DialogBase
{
///
/// Constructs a new .
///
- /// The owner of the dialog.
+ /// The owner of the dialog, for which this should show on top.
/// The text to show in the dialog.
public MessageWindowDialog(IWin32Window dialogParent, string text) : base(dialogParent, Resources.application_import_blue1, 200, 150)
{
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r6ef8fa312a72f486be984ebc3adde4be044811e2
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs (.../AvalonDockDockingManager.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs (.../AvalonDockDockingManager.cs) (revision 6ef8fa312a72f486be984ebc3adde4be044811e2)
@@ -43,6 +43,9 @@
namespace Core.Common.Gui.Forms.ViewManager
{
+ ///
+ /// Provides view docking management based on the 'Avalon Docking framework'.
+ ///
public class AvalonDockDockingManager : IDockingManager
{
public event EventHandler ViewBarClosing;
@@ -52,17 +55,22 @@
public event Action