Index: Application/Ringtoets/src/Application.Ringtoets/app.config
===================================================================
diff -u -ra8f80f236e48e52189148e3a6449823279185b76 -r0a30c1488bb2d215a84c02566382244fa2dcfd52
--- Application/Ringtoets/src/Application.Ringtoets/app.config (.../app.config) (revision a8f80f236e48e52189148e3a6449823279185b76)
+++ Application/Ringtoets/src/Application.Ringtoets/app.config (.../app.config) (revision 0a30c1488bb2d215a84c02566382244fa2dcfd52)
@@ -69,9 +69,6 @@
-
-
-
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r043516e6ae215ccc09fdfd7d8193a8885a143bf7 -r0a30c1488bb2d215a84c02566382244fa2dcfd52
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 043516e6ae215ccc09fdfd7d8193a8885a143bf7)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 0a30c1488bb2d215a84c02566382244fa2dcfd52)
@@ -219,11 +219,6 @@
-
- Settings.settings
- True
- True
-
@@ -259,7 +254,6 @@
Copying.Lesser.licenseheader
-
@@ -338,11 +332,6 @@
-
- PublicSettingsSingleFileGenerator
- Settings.Designer.cs
- Designer
-
Index: Core/Common/src/Core.Common.Gui/GuiCore.cs
===================================================================
diff -u -ra8f80f236e48e52189148e3a6449823279185b76 -r0a30c1488bb2d215a84c02566382244fa2dcfd52
--- Core/Common/src/Core.Common.Gui/GuiCore.cs (.../GuiCore.cs) (revision a8f80f236e48e52189148e3a6449823279185b76)
+++ Core/Common/src/Core.Common.Gui/GuiCore.cs (.../GuiCore.cs) (revision 0a30c1488bb2d215a84c02566382244fa2dcfd52)
@@ -23,7 +23,6 @@
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Configuration;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
@@ -116,8 +115,6 @@
Plugins = new List();
- UserSettings = Properties.Settings.Default;
-
viewCommandHandler = new ViewCommandHandler(this, this, this);
storageCommandHandler = new StorageCommandHandler(projectStore, this, MainWindow);
exportImportCommandHandler = new ExportImportCommandHandler(MainWindow,
@@ -180,13 +177,6 @@
isExiting = true;
- if (userSettingsDirty)
- {
- UserSettings.Save();
- }
-
- UserSettings = null;
-
// close faster (hide main window)
mainWindow.Visible = false;
@@ -680,40 +670,8 @@
#region Implementation: ISettingsOwner
- private bool userSettingsDirty;
- private ApplicationSettingsBase userSettings;
-
public GuiCoreSettings FixedSettings { get; private set; }
- public ApplicationSettingsBase UserSettings
- {
- get
- {
- return userSettings;
- }
- private set
- {
- if (userSettings != null)
- {
- userSettings.PropertyChanged -= UserSettingsPropertyChanged;
- }
-
- userSettings = value;
-
- if (userSettings != null)
- {
- userSettings.PropertyChanged += UserSettingsPropertyChanged;
- }
-
- userSettingsDirty = false;
- }
- }
-
- private void UserSettingsPropertyChanged(object sender, PropertyChangedEventArgs e)
- {
- userSettingsDirty = true;
- }
-
#endregion
#region Implementation: IGuiPluginHost
Fisheye: Tag 0a30c1488bb2d215a84c02566382244fa2dcfd52 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 0a30c1488bb2d215a84c02566382244fa2dcfd52 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Properties/Settings.settings'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Settings/ISettingsOwner.cs
===================================================================
diff -u -r4512af7782ee31b36941bb280b54d9da2953dd71 -r0a30c1488bb2d215a84c02566382244fa2dcfd52
--- Core/Common/src/Core.Common.Gui/Settings/ISettingsOwner.cs (.../ISettingsOwner.cs) (revision 4512af7782ee31b36941bb280b54d9da2953dd71)
+++ Core/Common/src/Core.Common.Gui/Settings/ISettingsOwner.cs (.../ISettingsOwner.cs) (revision 0a30c1488bb2d215a84c02566382244fa2dcfd52)
@@ -19,8 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using System.Configuration;
-
namespace Core.Common.Gui.Settings
{
///
@@ -32,10 +30,5 @@
/// Gets the fixed settings of the user interface.
///
GuiCoreSettings FixedSettings { get; }
-
- ///
- /// Gets the user specific settings of the user interface.
- ///
- ApplicationSettingsBase UserSettings { get; }
}
}
\ No newline at end of file
Fisheye: Tag 0a30c1488bb2d215a84c02566382244fa2dcfd52 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/app.config'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs
===================================================================
diff -u -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 -r0a30c1488bb2d215a84c02566382244fa2dcfd52
--- Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs (.../MainWindowTest.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs (.../MainWindowTest.cs) (revision 0a30c1488bb2d215a84c02566382244fa2dcfd52)
@@ -21,7 +21,6 @@
using System;
using System.ComponentModel;
-using System.Configuration;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
@@ -126,13 +125,11 @@
{
// Setup
var mocks = new MockRepository();
- var settings = mocks.Stub();
var viewHost = mocks.Stub();
viewHost.Stub(vm => vm.ToolViews).Return(new IView[0]);
var gui = mocks.Stub();
- gui.Stub(g => g.UserSettings).Return(settings);
gui.Stub(g => g.FixedSettings).Return(new GuiCoreSettings());
gui.Stub(g => g.Plugins).Return(Enumerable.Empty().ToList());
gui.Stub(g => g.ViewHost).Return(viewHost);
@@ -159,13 +156,11 @@
{
// Setup
var mocks = new MockRepository();
- var settings = mocks.Stub();
var viewHost = mocks.Stub();
viewHost.Stub(vm => vm.ToolViews).Return(new IView[0]);
var gui = mocks.Stub();
- gui.Stub(g => g.UserSettings).Return(settings);
gui.Stub(g => g.FixedSettings).Return(new GuiCoreSettings());
gui.Stub(g => g.Plugins).Return(Enumerable.Empty().ToList());
gui.Stub(g => g.ViewHost).Return(viewHost);
Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -ra8f80f236e48e52189148e3a6449823279185b76 -r0a30c1488bb2d215a84c02566382244fa2dcfd52
--- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision a8f80f236e48e52189148e3a6449823279185b76)
+++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision 0a30c1488bb2d215a84c02566382244fa2dcfd52)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using System.Configuration;
using System.Linq;
using System.Windows.Forms;
using System.Windows.Forms.VisualStyles;
@@ -101,7 +100,6 @@
Assert.AreEqual(null, gui.ViewHost);
Assert.AreEqual(null, gui.DocumentViewController);
- AssertDefaultUserSettings(gui.UserSettings);
Assert.AreSame(guiCoreSettings, gui.FixedSettings);
CollectionAssert.IsEmpty(gui.Plugins);
@@ -1039,11 +1037,5 @@
}
mocks.VerifyAll();
}
-
- private static void AssertDefaultUserSettings(SettingsBase settings)
- {
- Assert.IsNotNull(settings);
- CollectionAssert.IsEmpty(settings.Properties);
- }
}
}
\ No newline at end of file