WinGui: Fix a number of build warnings. Fixes #1720 and #1721 and a few other warnin...

diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index 6be0b8500d3b0ba1d5349ddb9b5f97c7368a8b44..3571728ea2b33a52b4fc87c74fb65bf92b260ff2 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -23,6 +23,7 @@
     <UseVSHostingProcess>true</UseVSHostingProcess>
     <Prefer32Bit>false</Prefer32Bit>
     <CodeAnalysisRuleSet>..\HandBrake.ruleset</CodeAnalysisRuleSet>
+    <NoWarn>0649</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
@@ -182,6 +183,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs b/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs
index 2d2632622e49408a5022402d75f59ca176c8f9cb..4f168166222ffa8f21b5a84c1bd67a39cdecbc7f 100644 (file)
--- a/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs
@@ -7,6 +7,8 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
+// ReSharper disable InconsistentNaming
+// ReSharper disable UnusedMember.Global
 namespace HandBrake.Interop.Interop.HbLib
 {
     using System;

diff --git a/win/CS/HandBrakeWPF/Commands/Menu/QueueCommands.cs b/win/CS/HandBrakeWPF/Commands/Menu/QueueCommands.cs
index 2f0bb009d9fc3851d8add5966cd8875772ce463c..c9e0d9fef53d48eec25f3a128210eb5ec92d8e00 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/Menu/QueueCommands.cs
+++ b/win/CS/HandBrakeWPF/Commands/Menu/QueueCommands.cs
@@ -76,6 +76,6 @@ namespace HandBrakeWPF.Commands.Menu
         /// <summary>
         /// The can execute changed.
         /// </summary>
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler CanExecuteChanged { add { } remove { } }
     }
 }

diff --git a/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs b/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs
index 238e6655ff192b54c58d16261a1669f45a2f1412..fd3a5f5f7e9da5a54adb7fcd4f02187ab8e48dec 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs
@@ -25,7 +25,7 @@ namespace HandBrakeWPF.Commands
         /// <summary>\r
         /// The can execute changed.\r
         /// </summary>\r
-        public event EventHandler CanExecuteChanged;\r
+        public event EventHandler CanExecuteChanged { add { } remove { } }\r
 \r
         /// <summary>\r
         /// The can execute.\r

diff --git a/win/CS/HandBrakeWPF/Commands/PresetMenuSelectCommand.cs b/win/CS/HandBrakeWPF/Commands/PresetMenuSelectCommand.cs
index 25a8e7404af5ad25715ff625db0dd6ac848d1bfa..84dc135a3ea9585d2fb24ece1b14276aba0dada7 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/PresetMenuSelectCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/PresetMenuSelectCommand.cs
@@ -54,6 +54,6 @@ namespace HandBrakeWPF.Commands
         /// <summary>
         /// The can execute changed.
         /// </summary>
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler CanExecuteChanged { add { } remove { } }
     }
 }

diff --git a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
index dfa0830a493631762e6c8c4f6c9de451eb29824b..5e014edbd233a5949cb2bf66ae5ec3c823ecf4a7 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
@@ -179,6 +179,6 @@ namespace HandBrakeWPF.Commands
         /// <summary>\r
         /// Can Execute Changed\r
         /// </summary>\r
-        public event EventHandler CanExecuteChanged;\r
+        public event EventHandler CanExecuteChanged { add { } remove { } }\r
     }\r
 }\r

diff --git a/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs b/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs
index 8edc537fcca0230bde4c7e388f570ba819b2a311..05e6056b7bf553955348bb2753417b41931cc6ef 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/SourceMenuCommand.cs
@@ -46,7 +46,7 @@ namespace HandBrakeWPF.Commands
         /// <summary>\r
         /// The can execute changed.\r
         /// </summary>\r
-        public event EventHandler CanExecuteChanged;\r
+        public event EventHandler CanExecuteChanged { add { } remove { } }\r
 \r
         #endregion\r
 \r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index db9dd3c3277978f89b9f4637c51b1f3222f65cb3..d241ecaa047d60eef2d5c9c2f1347a12558c84a0 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -483,9 +483,6 @@
       <SubType>Designer</SubType>\r
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>\r
     </EmbeddedResource>\r
-    <AdditionalFiles Include="..\stylecop.json">\r
-      <Link>stylecop.json</Link>\r
-    </AdditionalFiles>\r
     <None Include="app.config" />\r
     <None Include="app.manifest" />\r
     <None Include="Installer\Installer64.nsi" />\r
@@ -738,6 +735,11 @@
   </ItemGroup>\r
   <ItemGroup />\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
+\r
+  <PropertyGroup>\r
+    <TargetFrameworkSDKToolsDirectory Condition=" '$(Platform)' == 'x64'">$(TargetFrameworkSDKToolsDirectory)$(Platform)\</TargetFrameworkSDKToolsDirectory>\r
+  </PropertyGroup>\r
+\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.de.resx b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
index 54d0044069c5e7154384dfe949be194b7fba6ccd..10c428476d1a14f4bb78a80e9ef0b1d299afa551 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
@@ -59,46 +59,46 @@
             : using a System.ComponentModel.TypeConverter
             : 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:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <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: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">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <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: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" 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: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">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -341,7 +341,7 @@ Möchten Sie fortfahren?</value>
     <value>Anstehende Aufgaben {0}</value>
   </data>
   <data name="Main_NewDefaultPreset" xml:space="preserve">
-    <value>Neue Standardvoreinstellungen: {0}</value>
+    <value>Neue Standardvoreinstellung: {0}</value>
   </data>
   <data name="Main_NewUpdate" xml:space="preserve">
     <value>Ein neues Update ist verfügbar. Bitte zum Menü Extras  &gt; Einstellungen gehen um es zu installieren.</value>
@@ -1997,9 +1997,15 @@ Dies beeinflusst nicht die momentanen Einstellungen im Untertitel-Tab. </value>
     <value>'Wählen' auswählen um den Standardspeicherort festzulegen</value>
   </data>
   <data name="MainView_Hide" xml:space="preserve">
-    <value />
+    <value>Ausblenden</value>
   </data>
   <data name="MainView_Show" xml:space="preserve">
-    <value />
+    <value>Zeigen</value>
+  </data>
+  <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+    <value>Alles zur Warteschlange hinzufügen</value>
+  </data>
+  <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+    <value>Auswahl zur Warteschlange hinzufügen</value>
   </data>
-</root>
\ No newline at end of file
+</root>

diff --git a/win/CS/HandBrakeWPF/Services/Scan/Model/Audio.cs b/win/CS/HandBrakeWPF/Services/Scan/Model/Audio.cs
index 193fc35bda7c78a59f0531c5a371e30c07cc025c..d71be495bba57b9f05860e0ea5594fd8a84af5bb 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Scan/Model/Audio.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/Model/Audio.cs
@@ -187,7 +187,7 @@ namespace HandBrakeWPF.Services.Scan.Model
                 int result = this.TrackNumber;
                 result = (result * 397) ^ (this.Language != null ? this.Language.GetHashCode() : 0);
                 result = (result * 397) ^ (this.LanguageCode != null ? this.LanguageCode.GetHashCode() : 0);
-                result = (result * 397) ^ (this.Codec != null ? this.Codec.GetHashCode() : 0);
+                result = (result * 397) ^ (this.Codec.GetHashCode());
                 return result;
             }
         }

diff --git a/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs
index e6f3b17fcd79a5f0b5489c4d92279a7b030e55a3..6adde6b6e74fdcd803aabd679f231066525f6946 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MetaDataViewModel.cs
@@ -42,7 +42,7 @@ namespace HandBrakeWPF.ViewModels
             this.task = new EncodeTask();
         }
 
-        public event EventHandler<TabStatusEventArgs> TabStatusChanged;
+        public event EventHandler<TabStatusEventArgs> TabStatusChanged { add { } remove { } }
 
         /// <summary>
         /// Gets or sets the meta data.