Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -rce792554075b8bfb2723bbdab4b3bdcb6cc58d6f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision ce792554075b8bfb2723bbdab4b3bdcb6cc58d6f) +++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -138,7 +138,6 @@ var settings = new GuiCoreSettings { - StartPageUrl = "http://www.helpdeskwater.nl", SupportEmailAddress = "www.helpdeskwater.nl", SupportPhoneNumber = "+31 (0)88-797 7102", Copyright = "© Deltares 2016", Index: Application/Ringtoets/src/Application.Ringtoets/app.config =================================================================== diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Application/Ringtoets/src/Application.Ringtoets/app.config (.../app.config) (revision 223b2a4edc4ac816051c7eeecb735c34a6246574) +++ Application/Ringtoets/src/Application.Ringtoets/app.config (.../app.config) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -71,15 +71,6 @@ - - - - - Startpagina - - - True - True Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -383,7 +383,6 @@ - Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml =================================================================== diff -u -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -88,7 +88,6 @@ - Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -24,7 +24,6 @@ using System.Collections.Specialized; using System.ComponentModel; using System.Diagnostics; -using System.Globalization; using System.IO; using System.Linq; using System.Windows; @@ -37,7 +36,6 @@ using Core.Common.Gui.Forms.ViewHost; using Core.Common.Gui.Selection; using Core.Common.Gui.Settings; -using Core.Common.Utils; using Fluent; using log4net; using Button = Fluent.Button; @@ -243,20 +241,6 @@ InitPropertiesWindowAndActivate(); } - /// - /// Shows the welcome page. - /// - /// If set to true the user settings determine - /// if the start page should be shown. If set to false the welcome page will - /// be shown regardless of user settings. - public void ShowStartPage(bool useUserSettings = true) - { - if (!useUserSettings || Convert.ToBoolean(settings.UserSettings["showStartPage"], CultureInfo.InvariantCulture)) - { - OpenStartPage(); - } - } - public void Dispose() { if (IsWindowDisposed) @@ -718,11 +702,6 @@ } } - private void OnFileHelpStartPage_Clicked(object sender, RoutedEventArgs e) - { - ShowStartPage(false); - } - private void OnFileHelpLicense_Clicked(object sender, RoutedEventArgs e) { viewController.DocumentViewController.OpenViewForData(richTextFile); @@ -745,20 +724,6 @@ } } - private void OpenStartPage() - { - var welcomePageName = (string) settings.UserSettings["startPageName"]; - var welcomePageUrl = settings.FixedSettings.StartPageUrl; - if (string.IsNullOrEmpty(welcomePageUrl)) - { - welcomePageUrl = "about:blank"; - } - - var url = new WebLink(welcomePageName, new Uri(welcomePageUrl)); - - commands.ViewCommands.OpenView(url); - } - private void CloseDocumentTab(object sender, ExecutedRoutedEventArgs e) { viewController.ViewHost.Remove(viewController.ViewHost.ActiveDocumentView); Index: Core/Common/src/Core.Common.Gui/GuiCore.cs =================================================================== diff -u -rce792554075b8bfb2723bbdab4b3bdcb6cc58d6f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/GuiCore.cs (.../GuiCore.cs) (revision ce792554075b8bfb2723bbdab4b3bdcb6cc58d6f) +++ Core/Common/src/Core.Common.Gui/GuiCore.cs (.../GuiCore.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -475,8 +475,6 @@ } mainWindow.ValidateItems(); - - mainWindow.ShowStartPage(); }; mainWindow.Closing += delegate(object sender, CancelEventArgs e) Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -1232,15 +1232,6 @@ } /// - /// Looks up a localized string similar to Startpagina. - /// - public static string Ribbon_Start_Page { - get { - return ResourceManager.GetString("Ribbon_Start_Page", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Statustekst. /// public static string Ribbon_StatusBar_Status_text { @@ -1434,16 +1425,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap startpage { - get { - object obj = ResourceManager.GetObject("startpage", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Project aan het sluiten.... /// public static string StorageCommandHandler_ClosingProject_Title { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -rd8fbeb182d1b3615105c982ab5fc76ce8a2cad2f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision d8fbeb182d1b3615105c982ab5fc76ce8a2cad2f) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -178,9 +178,6 @@ ..\Resources\application_view_list.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Startpagina - ..\Resources\DocumentHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -232,9 +229,6 @@ Ringtoets wordt gestart... - - ..\resources\startpage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Berichten Index: Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs =================================================================== diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 223b2a4edc4ac816051c7eeecb735c34a6246574) +++ Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs (.../Settings.Designer.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -58,43 +58,7 @@ [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string lastVisitedPath { - get { - return ((string)(this["lastVisitedPath"])); - } - set { - this["lastVisitedPath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Startpagina")] - public string startPageName { - get { - return ((string)(this["startPageName"])); - } - set { - this["startPageName"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool showStartPage { - get { - return ((bool)(this["showStartPage"])); - } - set { - this["showStartPage"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] public bool showSplashScreen { get { return ((bool)(this["showSplashScreen"])); Index: Core/Common/src/Core.Common.Gui/Properties/Settings.settings =================================================================== diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Properties/Settings.settings (.../Settings.settings) (revision 223b2a4edc4ac816051c7eeecb735c34a6246574) +++ Core/Common/src/Core.Common.Gui/Properties/Settings.settings (.../Settings.settings) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -11,15 +11,6 @@ - - - - - Startpagina - - - True - True Index: Core/Common/src/Core.Common.Gui/Resources/startpage.png =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 Binary files differ Index: Core/Common/src/Core.Common.Gui/Settings/GuiCoreSettings.cs =================================================================== diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/Settings/GuiCoreSettings.cs (.../GuiCoreSettings.cs) (revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5) +++ Core/Common/src/Core.Common.Gui/Settings/GuiCoreSettings.cs (.../GuiCoreSettings.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -27,11 +27,6 @@ public class GuiCoreSettings { /// - /// Gets or sets the start page url to use in the graphical user interface. - /// - public string StartPageUrl { get; set; } - - /// /// Gets or sets the support email address to show in the graphical user interface. /// public string SupportEmailAddress { get; set; } Index: Core/Common/src/Core.Common.Gui/app.config =================================================================== diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/src/Core.Common.Gui/app.config (.../app.config) (revision 223b2a4edc4ac816051c7eeecb735c34a6246574) +++ Core/Common/src/Core.Common.Gui/app.config (.../app.config) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -30,15 +30,6 @@ - - - - - Startpagina - - - True - True Index: Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs =================================================================== diff -u -r223b2a4edc4ac816051c7eeecb735c34a6246574 -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs (.../MainWindowTest.cs) (revision 223b2a4edc4ac816051c7eeecb735c34a6246574) +++ Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs (.../MainWindowTest.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -27,15 +27,13 @@ using System.Windows.Controls; using System.Windows.Input; using Core.Common.Controls.Views; -using Core.Common.Gui.Commands; using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Forms.MessageWindow; using Core.Common.Gui.Forms.PropertyGridView; using Core.Common.Gui.Forms.ViewHost; using Core.Common.Gui.Plugin; using Core.Common.Gui.PropertyBag; using Core.Common.Gui.Settings; -using Core.Common.Utils; using Core.Common.Utils.Reflection; using NUnit.Framework; using Rhino.Mocks; @@ -446,150 +444,6 @@ [Test] [STAThread] - public void ShowStartPage_IgnoreUserSettings_OpenViewForWebPage() - { - // Setup - const string pageName = ""; - var fixedSettings = new GuiCoreSettings - { - StartPageUrl = "http://www.google.nl" - }; - - var mocks = new MockRepository(); - - var userSettings = mocks.Stub(); - userSettings["startPageName"] = pageName; - - var viewCommands = mocks.Stub(); - viewCommands.Expect(c => c.OpenView(Arg.Matches(link => link.Name == pageName && - link.Path == new Uri(fixedSettings.StartPageUrl)))); - - var gui = mocks.Stub(); - gui.Stub(g => g.FixedSettings).Return(fixedSettings); - gui.Stub(g => g.UserSettings).Return(userSettings); - gui.Stub(g => g.ViewCommands).Return(viewCommands); - mocks.ReplayAll(); - - using (var mainWindow = new Gui.Forms.MainWindow.MainWindow()) - { - mainWindow.SetGui(gui); - - // Call - mainWindow.ShowStartPage(false); - } - // Assert - mocks.VerifyAll(); // Assert that expectancies are met - } - - [Test] - [STAThread] - [TestCase(null)] - [TestCase("")] - public void ShowStartPage_IgnoreUserSettingsAndNoStartPageUrl_OpenViewForAboutBlank(string startPageNameValue) - { - // Setup - var fixedSettings = new GuiCoreSettings - { - StartPageUrl = "about:blank" - }; - - var mocks = new MockRepository(); - - var userSettings = mocks.Stub(); - userSettings["startPageName"] = startPageNameValue; - - var viewCommands = mocks.Stub(); - viewCommands.Expect(c => c.OpenView(Arg.Matches(link => link.Name == startPageNameValue && - link.Path == new Uri(fixedSettings.StartPageUrl)))); - - var gui = mocks.Stub(); - gui.Stub(g => g.FixedSettings).Return(fixedSettings); - gui.Stub(g => g.UserSettings).Return(userSettings); - gui.Stub(g => g.ViewCommands).Return(viewCommands); - mocks.ReplayAll(); - - using (var mainWindow = new Gui.Forms.MainWindow.MainWindow()) - { - mainWindow.SetGui(gui); - - // Call - mainWindow.ShowStartPage(false); - } - // Assert - mocks.VerifyAll(); // Assert that expectancies are met - } - - [Test] - [STAThread] - public void ShowStartPage_FromUserSettings_OpenViewForWebPage() - { - // Setup - const string pageName = ""; - var fixedSettings = new GuiCoreSettings - { - StartPageUrl = "http://www.google.nl" - }; - - var mocks = new MockRepository(); - - var userSettings = mocks.Stub(); - userSettings["startPageName"] = pageName; - userSettings["showStartPage"] = true.ToString(); - - var viewCommands = mocks.Stub(); - viewCommands.Expect(c => c.OpenView(Arg.Matches(link => link.Name == pageName && - link.Path == new Uri(fixedSettings.StartPageUrl)))); - - var gui = mocks.Stub(); - gui.Stub(g => g.FixedSettings).Return(fixedSettings); - gui.Stub(g => g.UserSettings).Return(userSettings); - gui.Stub(g => g.ViewCommands).Return(viewCommands); - mocks.ReplayAll(); - - using (var mainWindow = new Gui.Forms.MainWindow.MainWindow()) - { - mainWindow.SetGui(gui); - - // Call - mainWindow.ShowStartPage(); - } - // Assert - mocks.VerifyAll(); // Assert that expectancies are met - } - - [Test] - [STAThread] - public void ShowStartPage_FromUserSettingsWithShowStartPageFalse_DoNothing() - { - // Setup - var fixedSettings = new GuiCoreSettings(); - - var mocks = new MockRepository(); - - var userSettings = mocks.Stub(); - userSettings["showStartPage"] = false.ToString(); - - var viewCommands = mocks.StrictMock(); - - var gui = mocks.Stub(); - gui.Stub(g => g.FixedSettings).Return(fixedSettings); - gui.Stub(g => g.UserSettings).Return(userSettings); - gui.Stub(g => g.ViewCommands).Return(viewCommands); - mocks.ReplayAll(); - - using (var mainWindow = new Gui.Forms.MainWindow.MainWindow()) - { - mainWindow.SetGui(gui); - - // Call - mainWindow.ShowStartPage(); - } - // Assert - mocks.VerifyAll(); // Assert that expectancies are met - } - - [Test] - [STAThread] public void SetWaitCursorOn_SetMouseOverrideToWait() { // Setup Index: Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs =================================================================== diff -u -rce792554075b8bfb2723bbdab4b3bdcb6cc58d6f -r3fdd2bee85bdf8b556c52d6706ed887c2b70bed4 --- Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision ce792554075b8bfb2723bbdab4b3bdcb6cc58d6f) +++ Core/Common/test/Core.Common.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision 3fdd2bee85bdf8b556c52d6706ed887c2b70bed4) @@ -1041,7 +1041,7 @@ private static void AssertDefaultUserSettings(SettingsBase settings) { Assert.IsNotNull(settings); - Assert.AreEqual(7, settings.Properties.Count); + Assert.AreEqual(4, settings.Properties.Count); // Note: Cannot assert particular values, as they can be changed by user. var mruList = (StringCollection) settings["mruList"]; @@ -1050,12 +1050,6 @@ Assert.IsNotNull(defaultViewDataTypes); var defaultViews = (StringCollection) settings["defaultViews"]; Assert.IsNotNull(defaultViews); - var lastVisitedPath = (string) settings["lastVisitedPath"]; - Assert.IsNotNull(lastVisitedPath); - var startPageName = (string) settings["startPageName"]; - Assert.IsNotNull(startPageName); - var showStartPage = (bool) settings["showStartPage"]; - Assert.IsNotNull(showStartPage); var showSplashScreen = (bool) settings["showSplashScreen"]; Assert.IsNotNull(showSplashScreen); }