Icon Path fix

new zip
kmecke · May 31, 2018 · a30d20e · a30d20e
1 parent 0ce976b
commit a30d20e
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 32 deletions.
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/WPFeyes.zip b/WPFeyes.zip
diff --git 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
diff --git 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.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Rastergrafik" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\WpfEyesIcon\Rastergrafik.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/WPFeyes/Resources/EyeIcon.ico b/WPFeyes/Resources/EyeIcon.ico
diff --git a/WPFeyes/WPFeyes.csproj b/WPFeyes/WPFeyes.csproj
@@ -146,5 +146,11 @@
   <ItemGroup>
     <Resource Include="Rastergrafik.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\EyeIcon.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="WpfEyesIcon\Rastergrafik.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/WPFeyes/bin/Debug/WPFeyes.exe b/WPFeyes/bin/Debug/WPFeyes.exe
diff --git a/WPFeyes/bin/Debug/WPFeyes.pdb b/WPFeyes/bin/Debug/WPFeyes.pdb