Index: Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj =================================================================== diff -u -r0f6ff5fa17ae2d6453a81cc756c91fd37744981a -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj (.../Application.Riskeer.Setup.wixproj) (revision 0f6ff5fa17ae2d6453a81cc756c91fd37744981a) +++ Application/Riskeer/src/Application.Riskeer.Setup/Application.Riskeer.Setup.wixproj (.../Application.Riskeer.Setup.wixproj) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -192,7 +192,7 @@ - + Index: Application/Riskeer/src/Application.Riskeer.Setup/Ringtoets.ico =================================================================== diff -u -r6306d3ac935004a8f9b642d4f29f94d9a1e0eebb -r757490d9e6f63d5f6dad69466095a4e1475e8769 Binary files differ Index: Application/Riskeer/src/Application.Riskeer.Setup/Riskeer.ico =================================================================== diff -u Binary files differ Index: Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj =================================================================== diff -u -r0963c1674074541ba484125bbd795deae54b3c8b -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj (.../Application.Riskeer.csproj) (revision 0963c1674074541ba484125bbd795deae54b3c8b) +++ Application/Riskeer/src/Application.Riskeer/Application.Riskeer.csproj (.../Application.Riskeer.csproj) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -43,7 +43,7 @@ false - Ringtoets.ico + Riskeer.ico @@ -226,7 +226,7 @@ - + Index: Application/Riskeer/src/Application.Riskeer/Ringtoets.ico =================================================================== diff -u -r118e48039447bf16cc83a2adba517c20da8e06c8 -r757490d9e6f63d5f6dad69466095a4e1475e8769 Binary files differ Index: Application/Riskeer/src/Application.Riskeer/Riskeer.ico =================================================================== diff -u Binary files differ Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -r3882746b496b55f9c4ff66628a7e3f1f0fc22f81 -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 3882746b496b55f9c4ff66628a7e3f1f0fc22f81) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -298,4 +298,7 @@ + + + \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -31,7 +31,7 @@ xmlns:viewHost="clr-namespace:Core.Common.Gui.Forms.ViewHost" mc:Ignorable="d" x:Class="Core.Common.Gui.Forms.MainWindow.MainWindow" Title="MainWindow" Height="768" Width="1024" Background="White" Foreground="Black" x:Name="Window" - Icon="/Core.Common.Gui;component\Resources/Ringtoets.ico" + Icon="/Core.Common.Gui;component\Resources/Riskeer.ico" ResizeMode="CanResizeWithGrip" FlowDirection="LeftToRight" Loaded="MainWindow_OnLoaded"> Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -72,7 +72,7 @@ /// /// The dialog parent for which this dialog should be shown on top. /// The activities to be executed when the dialog is shown. - public ActivityProgressDialog(IWin32Window dialogParent, IEnumerable activities) : base(dialogParent, Resources.Ringtoets, 520, 150) + public ActivityProgressDialog(IWin32Window dialogParent, IEnumerable activities) : base(dialogParent, Resources.Riskeer, 520, 150) { InitializeComponent(); Index: Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml =================================================================== diff -u -r6cdb90fc3f89fe0c44b62d3be7266a0090a6b891 -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml (.../SplashScreen.xaml) (revision 6cdb90fc3f89fe0c44b62d3be7266a0090a6b891) +++ Core/Common/src/Core.Common.Gui/Forms/SplashScreen/SplashScreen.xaml (.../SplashScreen.xaml) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -25,7 +25,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:properties="clr-namespace:Core.Common.Gui.Properties" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="Core.Common.Gui.Forms.SplashScreen.SplashScreen" - WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" BorderThickness="0,0,0,0" Foreground="{x:Null}" AllowsTransparency="True" Icon="/Core.Common.Gui;component/Resources/Ringtoets.ico" SizeToContent="WidthAndHeight"> + WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" BorderThickness="0,0,0,0" Foreground="{x:Null}" AllowsTransparency="True" Icon="/Core.Common.Gui;component/Resources/Riskeer.ico" SizeToContent="WidthAndHeight"> Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r3882746b496b55f9c4ff66628a7e3f1f0fc22f81 -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3882746b496b55f9c4ff66628a7e3f1f0fc22f81) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -1401,9 +1401,9 @@ /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - public static System.Drawing.Icon Ringtoets { + public static System.Drawing.Icon Riskeer { get { - object obj = ResourceManager.GetObject("Ringtoets", resourceCulture); + object obj = ResourceManager.GetObject("Riskeer", resourceCulture); return ((System.Drawing.Icon)(obj)); } } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r3882746b496b55f9c4ff66628a7e3f1f0fc22f81 -r757490d9e6f63d5f6dad69466095a4e1475e8769 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 3882746b496b55f9c4ff66628a7e3f1f0fc22f81) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 757490d9e6f63d5f6dad69466095a4e1475e8769) @@ -286,9 +286,6 @@ ..\Resources\icon_clear_all_messages.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Ringtoets.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Aantal ({0}) @@ -610,4 +607,7 @@ {0} (*.{1}) + + ..\Resources\Riskeer.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Resources/Ringtoets.ico =================================================================== diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r757490d9e6f63d5f6dad69466095a4e1475e8769 Binary files differ Index: Core/Common/src/Core.Common.Gui/Resources/Riskeer.ico =================================================================== diff -u Binary files differ