Index: Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj =================================================================== diff -u -r1c5766a024ca851f39c3eb7087c1365615889b6f -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision 1c5766a024ca851f39c3eb7087c1365615889b6f) +++ Application/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj (.../Application.Ringtoets.Setup.wixproj) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -66,9 +66,9 @@ + - Index: Application/Application.Ringtoets.Setup/Product.wxs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets.Setup/Product.wxs (.../Product.wxs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Application/Application.Ringtoets.Setup/Product.wxs (.../Product.wxs) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -11,7 +11,7 @@ - + @@ -46,7 +46,7 @@ Description="!(loc.StartApplicationDescription)" Target="[APPLICATIONDIR]$(var.Application.Ringtoets.TargetFileName)" WorkingDirectory="APPLICATIONDIR" - Icon="Wti.ico"/> + Icon="Ringtoets.ico"/> @@ -68,7 +68,7 @@ Description="!(loc.StartApplicationDescription)" Target="[APPLICATIONDIR]$(var.Application.Ringtoets.TargetFileName)" WorkingDirectory="APPLICATIONDIR" - Icon="Wti.ico"/> + Icon="Ringtoets.ico"/> @@ -89,7 +89,7 @@ Description="!(loc.StartApplicationDescription)" Target="[APPLICATIONDIR]$(var.Application.Ringtoets.TargetFileName)" WorkingDirectory="APPLICATIONDIR" - Icon="Wti.ico"/> + Icon="Ringtoets.ico"/> @@ -105,7 +105,7 @@ - + \ No newline at end of file Index: Application/Application.Ringtoets.Setup/Ringtoets.ico =================================================================== diff -u Binary files differ Index: Application/Application.Ringtoets.Setup/Wti.ico =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 Binary files differ Index: Application/Application.Ringtoets/Application.Ringtoets.csproj =================================================================== diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 9f01c4daf5b7af6549045ed6ac404d18419c2555) +++ Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -384,6 +384,7 @@ + MessageWindowData.xsd @@ -407,7 +408,6 @@ - @@ -461,7 +461,6 @@ - Index: Application/Application.Ringtoets/Forms/MainWindow/MainWindow.xaml =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Application/Application.Ringtoets/Forms/MainWindow/MainWindow.xaml (.../MainWindow.xaml) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -9,7 +9,7 @@ xmlns:Properties="clr-namespace:Application.Ringtoets.Properties" mc:Ignorable="d" x:Class="Application.Ringtoets.Forms.MainWindow.MainWindow" Title="MainWindow" Height="768" Width="1024" Background="White" Foreground="Black" x:Name="window" - Icon="/Application.Ringtoets;component\Resources/Deltares.ico" + Icon="/Application.Ringtoets;component\Resources/Ringtoets.ico" ResizeMode="CanResizeWithGrip" FlowDirection="LeftToRight" Loaded="MainWindow_OnLoaded"> Index: Application/Application.Ringtoets/Forms/SplashScreen.xaml =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets/Forms/SplashScreen.xaml (.../SplashScreen.xaml) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Application/Application.Ringtoets/Forms/SplashScreen.xaml (.../SplashScreen.xaml) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Properties="clr-namespace:Application.Ringtoets.Properties" - Width="455px" Height="389px" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" BorderThickness="0,0,0,1" Foreground="{x:Null}" AllowsTransparency="True" Icon="/Application.Ringtoets;component/Resources/Deltares.ico"> + Width="455px" Height="389px" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" BorderThickness="0,0,0,1" Foreground="{x:Null}" AllowsTransparency="True" Icon="/Application.Ringtoets;component/Resources/Ringtoets.ico"> Index: Application/Application.Ringtoets/Properties/Resources.Designer.cs =================================================================== diff -u -rc8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21 -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21) +++ Application/Application.Ringtoets/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -3096,6 +3096,16 @@ } /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + public static System.Drawing.Icon Ringtoets { + get { + object obj = ResourceManager.GetObject("Ringtoets", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap SaveAllHS { Index: Application/Application.Ringtoets/Properties/Resources.resx =================================================================== diff -u -rc8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21 -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Application/Application.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision c8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21) +++ Application/Application.Ringtoets/Properties/Resources.resx (.../Resources.resx) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -1220,4 +1220,7 @@ ..\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 + \ No newline at end of file Index: Application/Application.Ringtoets/Resources/Deltares.ico =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 Binary files differ Index: Application/Application.Ringtoets/Resources/Icon1.ico =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 Binary files differ Index: Application/Application.Ringtoets/Resources/Ringtoets.ico =================================================================== diff -u Binary files differ Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj (.../Core.Plugins.ProjectExplorer.csproj) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Core.Plugins.ProjectExplorer.csproj (.../Core.Plugins.ProjectExplorer.csproj) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -178,7 +178,6 @@ - Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -58,7 +58,7 @@ { get { - return Properties.Resources.DLTRS.ToBitmap(); + return new Bitmap(32, 32); } } Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs =================================================================== diff -u -rc8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21 -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -469,16 +469,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - public static System.Drawing.Icon DLTRS { - get { - object obj = ResourceManager.GetObject("DLTRS", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap DocumentHS { Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx =================================================================== diff -u -rc8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21 -r3112e21825ab694afebf3e220a867e7af913a5b2 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx (.../Resources.resx) (revision c8dfbd9f64e9ecbf87650b3f2a0eb1566247ff21) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Properties/Resources.resx (.../Resources.resx) (revision 3112e21825ab694afebf3e220a867e7af913a5b2) @@ -355,9 +355,6 @@ ..\Resources\fullscreen.PNG;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DLTRS.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - &Project Explorer Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Resources/DLTRS.ico =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3112e21825ab694afebf3e220a867e7af913a5b2 Binary files differ