Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -r606a620901f7ed35c8be6a23d27e57096fc5269d -r77f39b82687804c76c0f34dc826b72d6f61d131a
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 606a620901f7ed35c8be6a23d27e57096fc5269d)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs (.../App.xaml.cs) (revision 77f39b82687804c76c0f34dc826b72d6f61d131a)
@@ -123,10 +123,10 @@
var settings = new GuiCoreSettings
{
+ ApplicationName = "Riskeer",
SupportWebsiteAddressUrl = "https://www.helpdeskwater.nl/onderwerpen/applicaties-modellen/applicaties-per/omgevings/omgevings/riskeer/",
SupportEmailAddressUrl = "https://www.helpdeskwater.nl/onderwerpen/applicaties-modellen/applicaties-per/omgevings/omgevings/riskeer/contact/vraag-ringtoets/",
SupportPhoneNumberUrl = "https://www.helpdeskwater.nl/secundaire-navigatie/contact/",
- MainWindowTitle = "Riskeer",
ManualFilePath = "Gebruikershandleiding Riskeer 21.1.1.pdf"
};
var mainWindow = new MainWindow();
Index: Core/Gui/src/Core.Gui/Forms/Backstage/BackstageViewModel.cs
===================================================================
diff -u -r2ccd820a20c579a55a3752d370c30781624e6dee -r77f39b82687804c76c0f34dc826b72d6f61d131a
--- Core/Gui/src/Core.Gui/Forms/Backstage/BackstageViewModel.cs (.../BackstageViewModel.cs) (revision 2ccd820a20c579a55a3752d370c30781624e6dee)
+++ Core/Gui/src/Core.Gui/Forms/Backstage/BackstageViewModel.cs (.../BackstageViewModel.cs) (revision 77f39b82687804c76c0f34dc826b72d6f61d131a)
@@ -60,7 +60,7 @@
this.settings = settings;
InfoViewModel = new InfoViewModel();
- AboutViewModel = new AboutViewModel(settings.MainWindowTitle, version);
+ AboutViewModel = new AboutViewModel(settings.ApplicationName, version);
SupportViewModel = new SupportViewModel();
OpenHelpdeskWaterWebsiteCommand = new RelayCommand(OnOpenHelpdeskWaterWebsite);
Index: Core/Gui/src/Core.Gui/GuiCore.cs
===================================================================
diff -u -r90e6ceb054e3c6826246e33aa9fe19f7aeedc444 -r77f39b82687804c76c0f34dc826b72d6f61d131a
--- Core/Gui/src/Core.Gui/GuiCore.cs (.../GuiCore.cs) (revision 90e6ceb054e3c6826246e33aa9fe19f7aeedc444)
+++ Core/Gui/src/Core.Gui/GuiCore.cs (.../GuiCore.cs) (revision 77f39b82687804c76c0f34dc826b72d6f61d131a)
@@ -784,7 +784,7 @@
mainWindow.Title = string.Format(CultureInfo.CurrentCulture,
"{0} - {1} {2}",
Project.Name,
- FixedSettings.MainWindowTitle,
+ FixedSettings.ApplicationName,
SettingsHelper.Instance.ApplicationVersion);
mainWindow.BackstageViewModel.InfoViewModel.SetProject(project);
Index: Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs
===================================================================
diff -u -r5d59491a99d3e9ae9d65b24a8774d1db96e57f4f -r77f39b82687804c76c0f34dc826b72d6f61d131a
--- Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs (.../GuiCoreSettings.cs) (revision 5d59491a99d3e9ae9d65b24a8774d1db96e57f4f)
+++ Core/Gui/src/Core.Gui/Settings/GuiCoreSettings.cs (.../GuiCoreSettings.cs) (revision 77f39b82687804c76c0f34dc826b72d6f61d131a)
@@ -27,6 +27,11 @@
public class GuiCoreSettings
{
///
+ /// Gets or sets the name of the application.
+ ///
+ public string ApplicationName { get; set; }
+
+ ///
/// Gets or sets the support website address url.
///
public string SupportWebsiteAddressUrl { get; set; }
@@ -42,11 +47,6 @@
public string SupportPhoneNumberUrl { get; set; }
///
- /// Gets or sets the title of the main window.
- ///
- public string MainWindowTitle { get; set; }
-
- ///
/// Gets or sets the path of the manual file.
///
public string ManualFilePath { get; set; }
Index: Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs
===================================================================
diff -u -rddd1c988761760ebc4ddc892a64960ec4537f717 -r77f39b82687804c76c0f34dc826b72d6f61d131a
--- Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs (.../BackstageViewModelTest.cs) (revision ddd1c988761760ebc4ddc892a64960ec4537f717)
+++ Core/Gui/test/Core.Gui.Test/Forms/Backstage/BackstageViewModelTest.cs (.../BackstageViewModelTest.cs) (revision 77f39b82687804c76c0f34dc826b72d6f61d131a)
@@ -49,7 +49,7 @@
// Setup
var settings = new GuiCoreSettings
{
- MainWindowTitle = "Riskeer"
+ ApplicationName = "Riskeer"
};
const string version = "1.0";
@@ -63,7 +63,7 @@
Assert.IsNull(viewModel.InfoViewModel.ProjectName);
Assert.IsNotNull(viewModel.AboutViewModel);
- Assert.AreEqual(settings.MainWindowTitle, viewModel.AboutViewModel.ApplicationName);
+ Assert.AreEqual(settings.ApplicationName, viewModel.AboutViewModel.ApplicationName);
Assert.AreEqual(version, viewModel.AboutViewModel.Version);
Assert.IsNotNull(viewModel.SupportViewModel);
Index: Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs
===================================================================
diff -u -rc15e5afd6206771891eb4295392897b9772a84be -r77f39b82687804c76c0f34dc826b72d6f61d131a
--- Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision c15e5afd6206771891eb4295392897b9772a84be)
+++ Core/Gui/test/Core.Gui.Test/GuiCoreTest.cs (.../GuiCoreTest.cs) (revision 77f39b82687804c76c0f34dc826b72d6f61d131a)
@@ -616,7 +616,7 @@
var fixedSettings = new GuiCoreSettings
{
- MainWindowTitle = ""
+ ApplicationName = ""
};
using (var mainWindow = new MainWindow())
@@ -642,7 +642,7 @@
Assert.AreEqual(fileName, gui.Project.Name,
"Project name should be updated to the name of the file.");
- var expectedTitle = $"{fileName} - {fixedSettings.MainWindowTitle} {SettingsHelper.Instance.ApplicationVersion}";
+ var expectedTitle = $"{fileName} - {fixedSettings.ApplicationName} {SettingsHelper.Instance.ApplicationVersion}";
Assert.AreEqual(expectedTitle, mainWindow.Title);
Assert.AreSame(gui.Project, mainWindow.ProjectExplorer.Data);
}
@@ -675,7 +675,7 @@
var fixedSettings = new GuiCoreSettings
{
- MainWindowTitle = ""
+ ApplicationName = ""
};
using (var mainWindow = new MainWindow())
@@ -688,7 +688,7 @@
// Assert
Assert.IsNull(gui.ProjectFilePath);
- var expectedTitle = $"{expectedProjectName} - {fixedSettings.MainWindowTitle} {SettingsHelper.Instance.ApplicationVersion}";
+ var expectedTitle = $"{expectedProjectName} - {fixedSettings.ApplicationName} {SettingsHelper.Instance.ApplicationVersion}";
Assert.AreEqual(expectedTitle, mainWindow.Title);
}
@@ -722,7 +722,7 @@
var fixedSettings = new GuiCoreSettings
{
- MainWindowTitle = ""
+ ApplicationName = ""
};
using (var mainWindow = new MainWindow())
@@ -737,7 +737,7 @@
TestHelper.AssertLogMessageWithLevelIsGenerated(Call, Tuple.Create(expectedErrorMessage, LogLevelConstant.Error));
Assert.IsNull(gui.ProjectFilePath);
- string expectedTitle = $"{expectedProjectName} - {fixedSettings.MainWindowTitle} {SettingsHelper.Instance.ApplicationVersion}";
+ string expectedTitle = $"{expectedProjectName} - {fixedSettings.ApplicationName} {SettingsHelper.Instance.ApplicationVersion}";
Assert.AreEqual(expectedTitle, mainWindow.Title);
}
@@ -774,7 +774,7 @@
var fixedSettings = new GuiCoreSettings
{
- MainWindowTitle = ""
+ ApplicationName = ""
};
using (var mainWindow = new MainWindow())
@@ -795,7 +795,7 @@
TestHelper.AssertLogMessagesWithLevelAreGenerated(Call, expectedMessages);
Assert.IsNull(gui.ProjectFilePath);
- var expectedTitle = $"{expectedProjectName} - {fixedSettings.MainWindowTitle} {SettingsHelper.Instance.ApplicationVersion}";
+ var expectedTitle = $"{expectedProjectName} - {fixedSettings.ApplicationName} {SettingsHelper.Instance.ApplicationVersion}";
Assert.AreEqual(expectedTitle, mainWindow.Title);
}
@@ -827,7 +827,7 @@
var fixedSettings = new GuiCoreSettings
{
- MainWindowTitle = ""
+ ApplicationName = ""
};
using (var mainWindow = new MainWindow())
@@ -848,7 +848,7 @@
TestHelper.AssertLogMessagesWithLevelAreGenerated(Call, expectedMessages);
Assert.IsNull(gui.ProjectFilePath);
- var expectedTitle = $"{expectedProjectName} - {fixedSettings.MainWindowTitle} {SettingsHelper.Instance.ApplicationVersion}";
+ var expectedTitle = $"{expectedProjectName} - {fixedSettings.ApplicationName} {SettingsHelper.Instance.ApplicationVersion}";
Assert.AreEqual(expectedTitle, mainWindow.Title);
}
@@ -876,7 +876,7 @@
var fixedSettings = new GuiCoreSettings
{
- MainWindowTitle = ""
+ ApplicationName = ""
};
using (var mainWindow = new MainWindow())
@@ -890,7 +890,7 @@
// Assert
Assert.IsNull(gui.ProjectFilePath);
Assert.AreSame(project, gui.Project);
- var expectedTitle = $"{expectedProjectName} - {fixedSettings.MainWindowTitle} {SettingsHelper.Instance.ApplicationVersion}";
+ var expectedTitle = $"{expectedProjectName} - {fixedSettings.ApplicationName} {SettingsHelper.Instance.ApplicationVersion}";
Assert.AreEqual(expectedTitle, mainWindow.Title);
}