diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index d35e4bb..8f59021 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/WPFeyes.zip b/WPFeyes.zip index 2773347..d5bf4ad 100644 Binary files a/WPFeyes.zip and b/WPFeyes.zip differ diff --git a/WPFeyes/EyeNotifyIcon.cs b/WPFeyes/EyeNotifyIcon.cs index 117c0ae..77bd3f1 100644 --- a/WPFeyes/EyeNotifyIcon.cs +++ b/WPFeyes/EyeNotifyIcon.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using WPFeyes.Properties; namespace WPFeyes { @@ -17,7 +18,7 @@ class EyeNotifyIcon public EyeNotifyIcon(MainWindow mw) { this.mw = mw; - nIcon.Icon = new Icon(@"../../WpfEyesIcon\Rastergrafik.ico"); + nIcon.Icon = Resources.Rastergrafik; // nIcon.ShowBalloonTip(5000, "Hi", "This is a BallonTip from Windows Notification", ToolTipIcon.Info); nIcon.ContextMenuStrip = ContextMenusCreate(); nIcon.Visible = true; diff --git a/WPFeyes/Properties/Resources.Designer.cs b/WPFeyes/Properties/Resources.Designer.cs index eb6e79b..0af7e53 100644 --- a/WPFeyes/Properties/Resources.Designer.cs +++ b/WPFeyes/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // //------------------------------------------------------------------------------ -namespace WPFeyes.Properties -{ - - +namespace WPFeyes.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,53 +19,55 @@ namespace WPFeyes.Properties // 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", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFeyes.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } + + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// + internal static System.Drawing.Icon Rastergrafik { + get { + object obj = ResourceManager.GetObject("Rastergrafik", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/WPFeyes/Properties/Resources.resx b/WPFeyes/Properties/Resources.resx index af7dbeb..ef5883d 100644 --- a/WPFeyes/Properties/Resources.resx +++ b/WPFeyes/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\WpfEyesIcon\Rastergrafik.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/WPFeyes/Resources/EyeIcon.ico b/WPFeyes/Resources/EyeIcon.ico new file mode 100644 index 0000000..5d06b9f Binary files /dev/null and b/WPFeyes/Resources/EyeIcon.ico differ diff --git a/WPFeyes/WPFeyes.csproj b/WPFeyes/WPFeyes.csproj index 21c25e7..b3de1b5 100644 --- a/WPFeyes/WPFeyes.csproj +++ b/WPFeyes/WPFeyes.csproj @@ -146,5 +146,11 @@ + + + + + + \ No newline at end of file diff --git a/WPFeyes/bin/Debug/WPFeyes.exe b/WPFeyes/bin/Debug/WPFeyes.exe index 2c59a50..8ec0589 100644 Binary files a/WPFeyes/bin/Debug/WPFeyes.exe and b/WPFeyes/bin/Debug/WPFeyes.exe differ diff --git a/WPFeyes/bin/Debug/WPFeyes.pdb b/WPFeyes/bin/Debug/WPFeyes.pdb index 999b0f0..c7263ca 100644 Binary files a/WPFeyes/bin/Debug/WPFeyes.pdb and b/WPFeyes/bin/Debug/WPFeyes.pdb differ