Index: Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r47f1476ea6166045c9c30e58d93c290755241ee8
--- Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 47f1476ea6166045c9c30e58d93c290755241ee8)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2021. All rights reserved.
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
//
// This file is part of Riskeer.
//
@@ -40,7 +40,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@@ -89,5 +89,15 @@
return ResourceManager.GetString("Value_In_Scientific_Notation", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ ///
+ public static System.Drawing.Icon warning {
+ get {
+ object obj = ResourceManager.GetObject("warning", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
}
}
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.resx
===================================================================
diff -u -r423d1b9192b360e75473602879f55cb4c2c570f7 -r47f1476ea6166045c9c30e58d93c290755241ee8
--- Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.resx (.../Resources.resx) (revision 423d1b9192b360e75473602879f55cb4c2c570f7)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Properties/Resources.resx (.../Resources.resx) (revision 47f1476ea6166045c9c30e58d93c290755241ee8)
@@ -121,4 +121,7 @@
Alle faalkansen kleiner dan 1/100.000 zijn afgerond weergegeven in wetenschappelijke notatie. Door een node te selecteren, wordt het bijhorende volledige getal in het eigenschappenpaneel weergegeven.
+
+ ..\Resources\warning.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Resources/warning.ico
===================================================================
diff -u -r156d0459ae98bc7a79b056e7b62dccbf3455995c -r47f1476ea6166045c9c30e58d93c290755241ee8
Binary files differ
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Templates/ZoomControlTemplate.xaml
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r47f1476ea6166045c9c30e58d93c290755241ee8
--- Core/Components/src/Core.Components.GraphSharp.Forms/Templates/ZoomControlTemplate.xaml (.../ZoomControlTemplate.xaml) (revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Templates/ZoomControlTemplate.xaml (.../ZoomControlTemplate.xaml) (revision 47f1476ea6166045c9c30e58d93c290755241ee8)
@@ -26,7 +26,7 @@
xmlns:p="clr-namespace:Core.Components.GraphSharp.Forms.Properties"
xmlns:wpfExtensionsControls="clr-namespace:WPFExtensions.Controls;assembly=WPFExtensions"
xmlns:converters="clr-namespace:Core.Components.GraphSharp.Forms.Converters"
- xmlns:commonProperties="clr-namespace:Core.Common.Gui.Properties;assembly=Core.Common.Gui">
+ xmlns:properties="clr-namespace:Core.Components.GraphSharp.Forms.Properties">
@@ -58,7 +58,7 @@
-
Index: Core/Components/test/Core.Components.GraphSharp.Forms.Test/Converters/IconToImageSourceConverterTest.cs
===================================================================
diff -u -r98b126b6d45b128483be32b5d76285ddfbe5655b -r47f1476ea6166045c9c30e58d93c290755241ee8
--- Core/Components/test/Core.Components.GraphSharp.Forms.Test/Converters/IconToImageSourceConverterTest.cs (.../IconToImageSourceConverterTest.cs) (revision 98b126b6d45b128483be32b5d76285ddfbe5655b)
+++ Core/Components/test/Core.Components.GraphSharp.Forms.Test/Converters/IconToImageSourceConverterTest.cs (.../IconToImageSourceConverterTest.cs) (revision 47f1476ea6166045c9c30e58d93c290755241ee8)
@@ -23,8 +23,8 @@
using System.Windows.Data;
using System.Windows.Media;
using Core.Components.GraphSharp.Forms.Converters;
+using Core.Components.GraphSharp.Forms.Properties;
using NUnit.Framework;
-using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
namespace Core.Components.GraphSharp.Forms.Test.Converters
{
@@ -48,7 +48,7 @@
var converter = new IconToImageSourceConverter();
// Call
- object imageSource = converter.Convert(CoreCommonGuiResources.warning, null, null, null);
+ object imageSource = converter.Convert(Resources.warning, null, null, null);
// Assert
Assert.IsInstanceOf(imageSource);