WinGui:

- Cleanup stylecop warnings. Import new stylecop for resharper settings.

git-svn-id: svn://localhost/HandBrake/trunk@3459 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs
index 9f75f69..dda8c95 100644 (file)
--- a/win/C#/Controls/Filters.cs
+++ b/win/C#/Controls/Filters.cs
@@ -8,6 +8,9 @@ namespace Handbrake.Controls
     using System;\r
     using System.Windows.Forms;\r
 \r
+    /// <summary>\r
+    /// The Filters Panel\r
+    /// </summary>\r
     public partial class Filters : UserControl\r
     {\r
         /// <summary>\r

diff --git a/win/C#/Controls/x264Panel.cs b/win/C#/Controls/x264Panel.cs
index 8d223f6..1be3893 100644 (file)
--- a/win/C#/Controls/x264Panel.cs
+++ b/win/C#/Controls/x264Panel.cs
@@ -8,6 +8,9 @@ namespace Handbrake.Controls
     using System;\r
     using System.Windows.Forms;\r
 \r
+    /// <summary>\r
+    /// The x264 Panel\r
+    /// </summary>\r
     public partial class x264Panel : UserControl\r
     {\r
         /* \r
@@ -38,7 +41,10 @@ namespace Handbrake.Controls
             {\r
                 return rtf_x264Query.Text;\r
             }\r
-            set { rtf_x264Query.Text = value; }\r
+            set\r
+            {\r
+                rtf_x264Query.Text = value;\r
+            }\r
         }\r
 \r
         /// <summary>\r

diff --git a/win/C#/Functions/AppcastReader.cs b/win/C#/Functions/AppcastReader.cs
index e6bd64b..6b4a484 100644 (file)
--- a/win/C#/Functions/AppcastReader.cs
+++ b/win/C#/Functions/AppcastReader.cs
@@ -54,9 +54,8 @@ namespace Handbrake.Functions
                 Match verShort = Regex.Match(result, @"sparkle:shortVersionString=""(([svn]*)([0-9.\s]*))\""");\r
 \r
                 this.Build = ver.ToString().Replace("sparkle:version=", string.Empty).Replace("\"", string.Empty);\r
-                this.Version = verShort.ToString().Replace("sparkle:shortVersionString=", string.Empty).Replace("\"", \r
-                                                                                                                string.\r
-                                                                                                                    Empty);\r
+                this.Version = verShort.ToString().Replace("sparkle:shortVersionString=", string.Empty).Replace(\r
+                    "\"", string.Empty);\r
                 this.DownloadFile = nodeItem["windows"].InnerText;\r
                 this.DescriptionUrl = new Uri(nodeItem["sparkle:releaseNotesLink"].InnerText);\r
             }\r

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 148f8f3..4d82fb1 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -411,6 +411,9 @@ namespace Handbrake.Functions
         /// <summary>\r
         /// Recover a queue from file.\r
         /// </summary>\r
+        /// <param name="encodeQueue">\r
+        /// The encode Queue.\r
+        /// </param>\r
         public static void RecoverQueue(IQueue encodeQueue)\r
         {\r
             DialogResult result = DialogResult.None;\r
@@ -449,7 +452,7 @@ namespace Handbrake.Functions
         }\r
 \r
         /// <summary>\r
-        /// Checks if this HandBrake is running multiple instances\r
+        /// Gets a value indicating whether HandBrake is running in multi instance mode\r
         /// </summary>\r
         /// <returns>True if the UI has another instance running</returns>\r
         public static bool IsMultiInstance\r

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 6498049..790d511 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -26,9 +26,6 @@ namespace Handbrake.Functions
         /// <param name="name">\r
         /// Name of the preset\r
         /// </param>\r
-        /// <param name="pictureSettings">\r
-        /// Save picture settings in the preset\r
-        /// </param>\r
         public static void LoadPreset(frmMain mainWindow, QueryParser presetQuery, string name)\r
         {\r
             #region Source\r

diff --git a/win/C#/Functions/Win32.cs b/win/C#/Functions/Win32.cs
index a501026..982ba1e 100644 (file)
--- a/win/C#/Functions/Win32.cs
+++ b/win/C#/Functions/Win32.cs
@@ -99,10 +99,7 @@ namespace Handbrake.Functions
         /// The lp buffer.\r
         /// </param>\r
         [DllImport("kernel32.dll")]\r
-        public static extern void GlobalMemoryStatus\r
-        (\r
-            ref MEMORYSTATUS lpBuffer\r
-        );\r
+        public static extern void GlobalMemoryStatus(ref MEMORYSTATUS lpBuffer);\r
 \r
         /// <summary>\r
         /// Generate a Console Ctrl Event\r

diff --git a/win/C#/HandBrake.5.0.ReSharper b/win/C#/HandBrake.5.0.ReSharper
deleted file mode 100644 (file)
index 22ca799..0000000
--- a/win/C#/HandBrake.5.0.ReSharper
+++ /dev/null
@@ -1,379 +0,0 @@
-<Configuration>\r
-  <CodeStyleSettings>\r
-    <ExternalPath IsNull="False">\r
-    </ExternalPath>\r
-    <Sharing>SOLUTION</Sharing>\r
-    <CSharp>\r
-      <FormatSettings>\r
-        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>\r
-        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>\r
-        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>\r
-        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>\r
-        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>\r
-        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>\r
-        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>\r
-        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>\r
-        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>\r
-        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>\r
-        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>\r
-        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>\r
-        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>\r
-        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>\r
-        <MODIFIERS_ORDER IsNull="False">\r
-          <Item>public</Item>\r
-          <Item>protected</Item>\r
-          <Item>internal</Item>\r
-          <Item>private</Item>\r
-          <Item>new</Item>\r
-          <Item>abstract</Item>\r
-          <Item>virtual</Item>\r
-          <Item>override</Item>\r
-          <Item>sealed</Item>\r
-          <Item>static</Item>\r
-          <Item>readonly</Item>\r
-          <Item>extern</Item>\r
-          <Item>unsafe</Item>\r
-          <Item>volatile</Item>\r
-        </MODIFIERS_ORDER>\r
-        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>\r
-        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>\r
-        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>\r
-        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>\r
-        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>\r
-        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>\r
-        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>\r
-        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>\r
-        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>\r
-        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>\r
-        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>\r
-        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>\r
-        <STICK_COMMENT>False</STICK_COMMENT>\r
-        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>\r
-        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>\r
-        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>\r
-        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>\r
-        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>\r
-        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>\r
-      </FormatSettings>\r
-      <UsingsSettings>\r
-        <AddImportsToDeepestScope>True</AddImportsToDeepestScope>\r
-        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>\r
-      </UsingsSettings>\r
-      <Naming2>\r
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-        <ExceptionName IsNull="False">\r
-        </ExceptionName>\r
-        <OverrideDefaultSettings>True</OverrideDefaultSettings>\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-      </Naming2>\r
-      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>\r
-<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">\r
-\r
-    <!-- Do not reorder COM interfaces -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Kind Is="interface"/>\r
-                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"\r
-                              Inherit="true"/>\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- Do not reorder P/Invoke structs -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Or>\r
-                    <Kind Is="struct"/>\r
-                    <Kind Is="class"/>\r
-                </Or>\r
-                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"\r
-                              Inherit="true"/>\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- Do not reorder P/Invoke classes (called xxxNativeMethods) -->\r
-    <Pattern>\r
-        <Match>\r
-            <And Weight="2000">\r
-                <Kind Is="class"/>\r
-                <Name Is=".*NativeMethods" />\r
-            </And>\r
-        </Match>\r
-    </Pattern>\r
-\r
-    <!-- StyleCop pattern -->\r
-    <Pattern RemoveAllRegions="true">\r
-        <Match>\r
-            <Or Weight="1000" >\r
-                <Kind Is="class" />\r
-                <Kind Is="struct" />\r
-                <Kind Is="interface"/>\r
-            </Or>\r
-        </Match>\r
-\r
-        <!-- constants and fields -->\r
-        <Entry>\r
-            <Match>\r
-                <Or>\r
-                    <Kind Is="constant"/>\r
-                    <Kind Is="field"/>\r
-                </Or>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Kind Order="constant field"/>\r
-                <Readonly/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Constants and Fields"/>\r
-        </Entry>\r
-\r
-        <!-- constructors -->\r
-        <Entry>\r
-            <Match>\r
-                <Or Weight="200">\r
-                    <Kind Is="constructor"/>\r
-                    <Kind Is="destructor"/>\r
-                </Or>\r
-            </Match>\r
-            <Sort>\r
-                <Static/>\r
-                <Kind Order="constructor destructor"/>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-            </Sort>\r
-            <Group Region="Constructors and Destructors"/>\r
-        </Entry>\r
-\r
-        <!-- delegates -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="delegate"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Delegates"/>\r
-        </Entry>\r
-\r
-        <!-- events -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="event"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Events"/>\r
-        </Entry>\r
-\r
-        <!-- enum -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="enum"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Enums"/>\r
-        </Entry>\r
-\r
-        <!-- interfaces -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="interface" />\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Interfaces"/>\r
-        </Entry>\r
-\r
-        <!-- properties -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="property"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Properties"/>\r
-        </Entry>\r
-\r
-        <!-- indexers -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="indexer"\r
-                      Weight="300" />\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Indexers"/>\r
-        </Entry>\r
-\r
-        <!-- operator -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="operator"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Operators"/>\r
-        </Entry>\r
-\r
-        <!-- public methods -->\r
-        <Entry>\r
-            <Match>\r
-                <And>\r
-                    <Kind Is="method"/>\r
-                    <Access Is="public"/>\r
-                </And>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Public Methods"/>\r
-        </Entry>\r
-\r
-        <!-- Implemented Interfaces -->\r
-        <Entry>\r
-            <Match>\r
-                <And Weight="500">\r
-                    <Kind Is="method"/>\r
-                    <ImplementsInterface CLRName=".*"/>\r
-                </And>\r
-            </Match>\r
-            <Sort>\r
-                <ImplementsInterface />\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Implemented Interfaces">\r
-                <ImplementsInterface Region="${ImplementsInterface}" />\r
-            </Group>\r
-        </Entry>\r
-\r
-        <!-- other methods -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="method"/>\r
-            </Match>\r
-            <Sort>\r
-                <Access Order="public internal protected-internal protected private"/>\r
-                <Static/>\r
-                <Name/>\r
-            </Sort>\r
-            <Group Region="Methods"/>\r
-        </Entry>\r
-\r
-        <!-- Nested structs -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="struct"\r
-                      Weight="600" />\r
-            </Match>\r
-            <Sort>\r
-                <Static />\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-        </Entry>\r
-\r
-        <!-- Nested classes -->\r
-        <Entry>\r
-            <Match>\r
-                <Kind Is="class"\r
-                      Weight="700" />\r
-            </Match>\r
-            <Sort>\r
-                <Static />\r
-                <Access Order="public internal protected-internal protected private" />\r
-                <Name/>\r
-            </Sort>\r
-        </Entry>\r
-\r
-        <!-- all other members -->\r
-        <Entry/>\r
-\r
-    </Pattern>\r
-</Patterns>\r
-]]></CustomMemberReorderingPatterns>\r
-    </CSharp>\r
-    <VB>\r
-      <FormatSettings />\r
-      <ImportsSettings />\r
-      <Naming2>\r
-        <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-        <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      </Naming2>\r
-    </VB>\r
-    <Web>\r
-      <Naming2 />\r
-    </Web>\r
-    <Xaml>\r
-      <Naming2 />\r
-    </Xaml>\r
-    <XML>\r
-      <FormatSettings />\r
-    </XML>\r
-    <GenerateMemberBody />\r
-    <Naming2>\r
-      <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
-      <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      <ExceptionName IsNull="False">\r
-      </ExceptionName>\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-    </Naming2>\r
-  </CodeStyleSettings>\r
-</Configuration>
\ No newline at end of file

diff --git a/win/C#/HandBrake.5.1.ReSharper b/win/C#/HandBrake.5.1.ReSharper
index 4c4f881..22ca799 100644 (file)
--- a/win/C#/HandBrake.5.1.ReSharper
+++ b/win/C#/HandBrake.5.1.ReSharper
@@ -5,6 +5,20 @@
     <Sharing>SOLUTION</Sharing>\r
     <CSharp>\r
       <FormatSettings>\r
+        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>\r
+        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>\r
+        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>\r
+        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>\r
+        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>\r
+        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>\r
+        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>\r
+        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>\r
+        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>\r
+        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>\r
+        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>\r
+        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>\r
+        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>\r
+        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>\r
         <MODIFIERS_ORDER IsNull="False">\r
           <Item>public</Item>\r
           <Item>protected</Item>\r
@@ -21,12 +35,305 @@
           <Item>unsafe</Item>\r
           <Item>volatile</Item>\r
         </MODIFIERS_ORDER>\r
+        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>\r
+        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>\r
+        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>\r
+        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>\r
+        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>\r
+        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>\r
+        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>\r
+        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>\r
+        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>\r
+        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>\r
+        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>\r
+        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>\r
+        <STICK_COMMENT>False</STICK_COMMENT>\r
+        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>\r
+        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>\r
+        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>\r
+        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>\r
+        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>\r
+        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>\r
       </FormatSettings>\r
-      <UsingsSettings />\r
+      <UsingsSettings>\r
+        <AddImportsToDeepestScope>True</AddImportsToDeepestScope>\r
+        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>\r
+      </UsingsSettings>\r
       <Naming2>\r
         <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
         <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
+        <ExceptionName IsNull="False">\r
+        </ExceptionName>\r
+        <OverrideDefaultSettings>True</OverrideDefaultSettings>\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
+        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
+        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
       </Naming2>\r
+      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>\r
+<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">\r
+\r
+    <!-- Do not reorder COM interfaces -->\r
+    <Pattern>\r
+        <Match>\r
+            <And Weight="2000">\r
+                <Kind Is="interface"/>\r
+                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"\r
+                              Inherit="true"/>\r
+            </And>\r
+        </Match>\r
+    </Pattern>\r
+\r
+    <!-- Do not reorder P/Invoke structs -->\r
+    <Pattern>\r
+        <Match>\r
+            <And Weight="2000">\r
+                <Or>\r
+                    <Kind Is="struct"/>\r
+                    <Kind Is="class"/>\r
+                </Or>\r
+                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"\r
+                              Inherit="true"/>\r
+            </And>\r
+        </Match>\r
+    </Pattern>\r
+\r
+    <!-- Do not reorder P/Invoke classes (called xxxNativeMethods) -->\r
+    <Pattern>\r
+        <Match>\r
+            <And Weight="2000">\r
+                <Kind Is="class"/>\r
+                <Name Is=".*NativeMethods" />\r
+            </And>\r
+        </Match>\r
+    </Pattern>\r
+\r
+    <!-- StyleCop pattern -->\r
+    <Pattern RemoveAllRegions="true">\r
+        <Match>\r
+            <Or Weight="1000" >\r
+                <Kind Is="class" />\r
+                <Kind Is="struct" />\r
+                <Kind Is="interface"/>\r
+            </Or>\r
+        </Match>\r
+\r
+        <!-- constants and fields -->\r
+        <Entry>\r
+            <Match>\r
+                <Or>\r
+                    <Kind Is="constant"/>\r
+                    <Kind Is="field"/>\r
+                </Or>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private"/>\r
+                <Kind Order="constant field"/>\r
+                <Readonly/>\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Constants and Fields"/>\r
+        </Entry>\r
+\r
+        <!-- constructors -->\r
+        <Entry>\r
+            <Match>\r
+                <Or Weight="200">\r
+                    <Kind Is="constructor"/>\r
+                    <Kind Is="destructor"/>\r
+                </Or>\r
+            </Match>\r
+            <Sort>\r
+                <Static/>\r
+                <Kind Order="constructor destructor"/>\r
+                <Access Order="public internal protected-internal protected private"/>\r
+            </Sort>\r
+            <Group Region="Constructors and Destructors"/>\r
+        </Entry>\r
+\r
+        <!-- delegates -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="delegate"/>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Static />\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Delegates"/>\r
+        </Entry>\r
+\r
+        <!-- events -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="event"/>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Static />\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Events"/>\r
+        </Entry>\r
+\r
+        <!-- enum -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="enum"/>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Enums"/>\r
+        </Entry>\r
+\r
+        <!-- interfaces -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="interface" />\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Interfaces"/>\r
+        </Entry>\r
+\r
+        <!-- properties -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="property"/>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private"/>\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Properties"/>\r
+        </Entry>\r
+\r
+        <!-- indexers -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="indexer"\r
+                      Weight="300" />\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Indexers"/>\r
+        </Entry>\r
+\r
+        <!-- operator -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="operator"/>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Operators"/>\r
+        </Entry>\r
+\r
+        <!-- public methods -->\r
+        <Entry>\r
+            <Match>\r
+                <And>\r
+                    <Kind Is="method"/>\r
+                    <Access Is="public"/>\r
+                </And>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public"/>\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Public Methods"/>\r
+        </Entry>\r
+\r
+        <!-- Implemented Interfaces -->\r
+        <Entry>\r
+            <Match>\r
+                <And Weight="500">\r
+                    <Kind Is="method"/>\r
+                    <ImplementsInterface CLRName=".*"/>\r
+                </And>\r
+            </Match>\r
+            <Sort>\r
+                <ImplementsInterface />\r
+                <Access Order="public internal protected-internal protected private"/>\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Implemented Interfaces">\r
+                <ImplementsInterface Region="${ImplementsInterface}" />\r
+            </Group>\r
+        </Entry>\r
+\r
+        <!-- other methods -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="method"/>\r
+            </Match>\r
+            <Sort>\r
+                <Access Order="public internal protected-internal protected private"/>\r
+                <Static/>\r
+                <Name/>\r
+            </Sort>\r
+            <Group Region="Methods"/>\r
+        </Entry>\r
+\r
+        <!-- Nested structs -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="struct"\r
+                      Weight="600" />\r
+            </Match>\r
+            <Sort>\r
+                <Static />\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Name/>\r
+            </Sort>\r
+        </Entry>\r
+\r
+        <!-- Nested classes -->\r
+        <Entry>\r
+            <Match>\r
+                <Kind Is="class"\r
+                      Weight="700" />\r
+            </Match>\r
+            <Sort>\r
+                <Static />\r
+                <Access Order="public internal protected-internal protected private" />\r
+                <Name/>\r
+            </Sort>\r
+        </Entry>\r
+\r
+        <!-- all other members -->\r
+        <Entry/>\r
+\r
+    </Pattern>\r
+</Patterns>\r
+]]></CustomMemberReorderingPatterns>\r
     </CSharp>\r
     <VB>\r
       <FormatSettings />\r
@@ -49,22 +356,24 @@
     <Naming2>\r
       <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
       <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
+      <ExceptionName IsNull="False">\r
+      </ExceptionName>\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
+      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
+      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
+      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
       <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />\r
-      <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />\r
-      <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />\r
       <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />\r
       <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
     </Naming2>\r
   </CodeStyleSettings>\r
 </Configuration>
\ No newline at end of file

diff --git a/win/C#/HandBrake.ApplicationServices/Functions/Logging.cs b/win/C#/HandBrake.ApplicationServices/Functions/Logging.cs
index aba92db..8231ba6 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Functions/Logging.cs
+++ b/win/C#/HandBrake.ApplicationServices/Functions/Logging.cs
@@ -23,6 +23,9 @@ namespace HandBrake.ApplicationServices.Functions
         /// <param name="encJob">\r
         /// The Encode Job Object\r
         /// </param>\r
+        /// <returns>\r
+        /// The create cli log header.\r
+        /// </returns>\r
         public static string CreateCliLogHeader(Job encJob)\r
         {\r
             StringBuilder logHeader = new StringBuilder();\r

diff --git a/win/C#/HandBrake.ApplicationServices/Functions/Win32.cs b/win/C#/HandBrake.ApplicationServices/Functions/Win32.cs
index a45d744..98f2247 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Functions/Win32.cs
+++ b/win/C#/HandBrake.ApplicationServices/Functions/Win32.cs
@@ -99,10 +99,7 @@ namespace HandBrake.ApplicationServices.Functions
         /// The lp buffer.\r
         /// </param>\r
         [DllImport("kernel32.dll")]\r
-        public static extern void GlobalMemoryStatus\r
-        (\r
-            ref MEMORYSTATUS lpBuffer\r
-        );\r
+        public static extern void GlobalMemoryStatus(ref MEMORYSTATUS lpBuffer);\r
 \r
         /// <summary>\r
         /// Generate a Console Ctrl Event\r

diff --git a/win/C#/HandBrake.ApplicationServices/Init.cs b/win/C#/HandBrake.ApplicationServices/Init.cs
index e8f2e18..bacf132 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Init.cs
+++ b/win/C#/HandBrake.ApplicationServices/Init.cs
@@ -140,6 +140,5 @@ namespace HandBrake.ApplicationServices
         /// Prevent system sleep\r
         /// </summary>\r
         public static bool PreventSleep;\r
-\r
     }\r
 }\r

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
index 09099ba..9ca8cdf 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Encode.cs
@@ -252,14 +252,15 @@ namespace HandBrake.ApplicationServices.Services
             SendKeys.Send("^C");\r
             SendKeys.Flush();\r
 \r
-            //if (HbProcess != null)\r
+            /*/if (HbProcess != null)\r
             //{\r
             //    HbProcess.StandardInput.AutoFlush = true;\r
             //    HbProcess.StandardInput.WriteLine("^c^z");\r
-            //}\r
+            //}*/\r
         }\r
 \r
         /* Helpers */\r
+\r
         /// <summary>\r
         /// Save a copy of the log to the users desired location or a default location\r
         /// if this feature is enabled in options.\r
@@ -314,9 +315,6 @@ namespace HandBrake.ApplicationServices.Services
         private void HbProcess_Exited(object sender, EventArgs e)\r
         {\r
             IsEncoding = false;\r
-\r
-            //   ReadFile(null);\r
-\r
             if (this.EncodeEnded != null)\r
                 this.EncodeEnded(this, new EventArgs());\r
 \r
@@ -344,9 +342,6 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>\r
         /// Read the log file\r
         /// </summary>\r
-        /// <param name="n">\r
-        /// The object.\r
-        /// </param>\r
         private void ReadFile()\r
         {\r
             logBuffer = new StringBuilder();\r
@@ -398,6 +393,9 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>\r
         /// Setup the logging.\r
         /// </summary>\r
+        /// <param name="encodeJob">\r
+        /// The encode Job.\r
+        /// </param>\r
         private void SetupLogging(Job encodeJob)\r
         {\r
             string logDir = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\HandBrake\\logs";\r

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IQueue.cs b/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IQueue.cs
index 981f3c1..b489f75 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IQueue.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Interfaces/IQueue.cs
@@ -58,16 +58,6 @@ namespace HandBrake.ApplicationServices.Services.Interfaces
         int Count { get; }\r
 \r
         /// <summary>\r
-        /// Gets a value indicating whether IsEncoding.\r
-        /// </summary>\r
-        bool IsEncoding { get; }\r
-\r
-        /// <summary>\r
-        /// Gets ActivityLog.\r
-        /// </summary>\r
-        string ActivityLog { get; }\r
-\r
-        /// <summary>\r
         /// Adds an item to the queue.\r
         /// </summary>\r
         /// <param name="query">\r
@@ -121,7 +111,12 @@ namespace HandBrake.ApplicationServices.Services.Interfaces
         /// <summary>\r
         /// Writes the current state of the queue in the form of a batch (.bat) file.\r
         /// </summary>\r
-        /// <param name="file">The location of the file to write the batch file to.</param>\r
+        /// <param name="file">\r
+        /// The location of the file to write the batch file to.\r
+        /// </param>\r
+        /// <returns>\r
+        /// The write batch script to file.\r
+        /// </returns>\r
         bool WriteBatchScriptToFile(string file);\r
 \r
         /// <summary>\r

diff --git a/win/C#/HandBrake.ApplicationServices/Services/Queue.cs b/win/C#/HandBrake.ApplicationServices/Services/Queue.cs
index 59c084f..7500dfe 100644 (file)
--- a/win/C#/HandBrake.ApplicationServices/Services/Queue.cs
+++ b/win/C#/HandBrake.ApplicationServices/Services/Queue.cs
@@ -252,7 +252,12 @@ namespace HandBrake.ApplicationServices.Services
         /// <summary>\r
         /// Writes the current state of the queue in the form of a batch (.bat) file.\r
         /// </summary>\r
-        /// <param name="file">The location of the file to write the batch file to.</param>\r
+        /// <param name="file">\r
+        /// The location of the file to write the batch file to.\r
+        /// </param>\r
+        /// <returns>\r
+        /// The write batch script to file.\r
+        /// </returns>\r
         public bool WriteBatchScriptToFile(string file)\r
         {\r
             string queries = string.Empty;\r

diff --git a/win/C#/HandBrakeCS.csproj.ReSharper b/win/C#/HandBrakeCS.csproj.ReSharper
deleted file mode 100644 (file)
index 9b05078..0000000
--- a/win/C#/HandBrakeCS.csproj.ReSharper
+++ /dev/null
@@ -1,3 +0,0 @@
-<Configuration>\r
-  <Localizable>No</Localizable>\r
-</Configuration>
\ No newline at end of file

diff --git a/win/C#/Presets/PresetsHandler.cs b/win/C#/Presets/PresetsHandler.cs
index 971a478..d53a64d 100644 (file)
--- a/win/C#/Presets/PresetsHandler.cs
+++ b/win/C#/Presets/PresetsHandler.cs
@@ -46,7 +46,7 @@ namespace Handbrake.Presets
         private List<Preset> userPresets = new List<Preset>();\r
 \r
         /// <summary>\r
-        ///  Last preset added\r
+        ///  Gets or sets the Last preset added\r
         /// </summary>\r
         public Preset LastPresetAdded { get; set; }\r
 \r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index 1c428c8..ff91746 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -12,10 +12,9 @@ namespace Handbrake
 \r
     using HandBrake.ApplicationServices;\r
 \r
+    using Handbrake.Presets;\r
     using Handbrake.Properties;\r
 \r
-    using Presets;\r
-\r
     /// <summary>\r
     /// HandBrake Starts Here\r
     /// </summary>\r
@@ -24,6 +23,9 @@ namespace Handbrake
         /// <summary>\r
         /// The main entry point for the application.\r
         /// </summary>\r
+        /// <param name="args">\r
+        /// The args.\r
+        /// </param>\r
         [STAThread]\r
         public static void Main(string[] args)\r
         {\r
@@ -121,9 +123,6 @@ namespace Handbrake
             }\r
         }\r
 \r
-\r
-        public static int InstanceId = 0;\r
-\r
-\r
+        public static int InstanceId;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/Settings.StyleCop b/win/C#/Settings.StyleCop
index 73638a7..a9622d8 100644 (file)
--- a/win/C#/Settings.StyleCop
+++ b/win/C#/Settings.StyleCop
@@ -87,6 +87,11 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>\r
           </RuleSettings>\r
         </Rule>\r
+        <Rule Name="AccessModifierMustBeDeclared">\r
+          <RuleSettings>\r
+            <BooleanProperty Name="Enabled">False</BooleanProperty>\r
+          </RuleSettings>\r
+        </Rule>\r
       </Rules>\r
       <AnalyzerSettings />\r
     </Analyzer>\r
@@ -102,6 +107,11 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>\r
           </RuleSettings>\r
         </Rule>\r
+        <Rule Name="ClosingParenthesisMustBeSpacedCorrectly">\r
+          <RuleSettings>\r
+            <BooleanProperty Name="Enabled">False</BooleanProperty>\r
+          </RuleSettings>\r
+        </Rule>\r
       </Rules>\r
       <AnalyzerSettings />\r
     </Analyzer>\r
@@ -222,6 +232,11 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>\r
           </RuleSettings>\r
         </Rule>\r
+        <Rule Name="UsingDirectivesMustBeOrderedAlphabeticallyByNamespace">\r
+          <RuleSettings>\r
+            <BooleanProperty Name="Enabled">False</BooleanProperty>\r
+          </RuleSettings>\r
+        </Rule>\r
       </Rules>\r
       <AnalyzerSettings />\r
     </Analyzer>\r

diff --git a/win/C#/frmAddPreset.cs b/win/C#/frmAddPreset.cs
index 22ba835..8a497d7 100644 (file)
--- a/win/C#/frmAddPreset.cs
+++ b/win/C#/frmAddPreset.cs
@@ -28,7 +28,9 @@ namespace Handbrake
         /// <summary>\r
         /// Initializes a new instance of the <see cref="frmAddPreset"/> class.\r
         /// </summary>\r
-        /// <param name="mainWindow"></param>\r
+        /// <param name="mainWindow">\r
+        /// The Main Window\r
+        /// </param>\r
         /// <param name="presetHandler">\r
         /// The preset handler.\r
         /// </param>\r

diff --git a/win/C#/frmDownload.cs b/win/C#/frmDownload.cs
index a3067e1..e7f06f6 100644 (file)
--- a/win/C#/frmDownload.cs
+++ b/win/C#/frmDownload.cs
@@ -12,15 +12,18 @@ namespace Handbrake
     using System.Threading;\r
     using System.Windows.Forms;\r
 \r
+    /// <summary>\r
+    /// The Download Window\r
+    /// </summary>\r
     public partial class frmDownload : Form\r
     {\r
-        private readonly Thread _downloadThread;\r
-        private Stream _responceStream;\r
-        private Stream _loacalStream;\r
-        private HttpWebRequest _webRequest;\r
-        private HttpWebResponse _webResponse;\r
-        private static int _progress;\r
-        private bool _killThread;\r
+        private readonly Thread downloadThread;\r
+        private Stream responceStream;\r
+        private Stream localStream;\r
+        private HttpWebRequest webRequest;\r
+        private HttpWebResponse webResponse;\r
+        private static int progress;\r
+        private bool killThread;\r
 \r
         private delegate void UpdateProgessCallback(long bytesRead, long totalBytes);\r
 \r
@@ -32,14 +35,14 @@ namespace Handbrake
         {\r
             InitializeComponent();\r
 \r
-            _downloadThread = new Thread(Download);\r
-            _downloadThread.Start(filename);\r
+            this.downloadThread = new Thread(Download);\r
+            this.downloadThread.Start(filename);\r
         }\r
 \r
         private void Download(object file)\r
         {\r
             string tempPath = Path.Combine(Path.GetTempPath(), "handbrake-setup.exe");\r
-            string hbUpdate = (string) file;\r
+            string hbUpdate = (string)file;\r
             WebClient wcDownload = new WebClient();\r
 \r
             try\r
@@ -47,29 +50,29 @@ namespace Handbrake
                 if (File.Exists(tempPath))\r
                     File.Delete(tempPath);\r
 \r
-                _webRequest = (HttpWebRequest) WebRequest.Create(hbUpdate);\r
-                _webRequest.Credentials = CredentialCache.DefaultCredentials;\r
-                _webResponse = (HttpWebResponse) _webRequest.GetResponse();\r
-                long fileSize = _webResponse.ContentLength;\r
+                this.webRequest = (HttpWebRequest)WebRequest.Create(hbUpdate);\r
+                this.webRequest.Credentials = CredentialCache.DefaultCredentials;\r
+                this.webResponse = (HttpWebResponse)this.webRequest.GetResponse();\r
+                long fileSize = this.webResponse.ContentLength;\r
 \r
-                _responceStream = wcDownload.OpenRead(hbUpdate);\r
-                _loacalStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);\r
+                this.responceStream = wcDownload.OpenRead(hbUpdate);\r
+                this.localStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);\r
 \r
                 int bytesSize;\r
                 byte[] downBuffer = new byte[2048];\r
 \r
                 long flength = 0;\r
-                while ((bytesSize = _responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)\r
+                while ((bytesSize = this.responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)\r
                 {\r
-                    if (_killThread)\r
+                    if (this.killThread)\r
                         return;\r
-                    _loacalStream.Write(downBuffer, 0, bytesSize);\r
-                    flength = _loacalStream.Length;\r
-                    Invoke(new UpdateProgessCallback(this.UpdateProgress), new object[] {_loacalStream.Length, fileSize});\r
+                    this.localStream.Write(downBuffer, 0, bytesSize);\r
+                    flength = this.localStream.Length;\r
+                    Invoke(new UpdateProgessCallback(this.UpdateProgress), new object[] {this.localStream.Length, fileSize});\r
                 }\r
 \r
-                _responceStream.Close();\r
-                _loacalStream.Close();\r
+                this.responceStream.Close();\r
+                this.localStream.Close();\r
 \r
                 if (flength != fileSize)\r
                     Invoke(new DownloadFailedCallback(this.DownloadFailed));\r
@@ -85,8 +88,8 @@ namespace Handbrake
         private void UpdateProgress(long bytesRead, long totalBytes)\r
         {\r
             long p = (bytesRead * 100) / totalBytes;\r
-            int.TryParse(p.ToString(), out _progress);\r
-            progress_download.Value = _progress;\r
+            int.TryParse(p.ToString(), out progress);\r
+            progress_download.Value = progress;\r
             lblProgress.Text = (bytesRead / 1024) + "k of " + (totalBytes / 1024) + "k ";\r
         }\r
 \r
@@ -108,11 +111,11 @@ namespace Handbrake
 \r
         private void btn_cancel_Click(object sender, EventArgs e)\r
         {\r
-            _killThread = true;\r
+            this.killThread = true;\r
             lblProgress.Text = "Cancelling ...";\r
-            if (_webResponse != null) _webResponse.Close();\r
-            if (_responceStream != null) _responceStream.Close();\r
-            if (_loacalStream != null) _loacalStream.Close();\r
+            if (this.webResponse != null) this.webResponse.Close();\r
+            if (this.responceStream != null) this.responceStream.Close();\r
+            if (this.localStream != null) this.localStream.Close();\r
             this.Close();\r
         }\r
     }\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 83135c6..642eb1f 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -26,6 +26,9 @@ namespace Handbrake
     using Presets;\r
     using Properties;\r
 \r
+    /// <summary>\r
+    /// The Main Window\r
+    /// </summary>\r
     public partial class frmMain : Form\r
     {\r
         // Objects which may be used by one or more other objects *************\r
@@ -910,7 +913,7 @@ namespace Handbrake
             MessageBox.Show("This feature has not been implimented yet.", "Not Implimented", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             return;\r
 \r
-            SaveFileDialog savefiledialog = new SaveFileDialog();\r
+            /*SaveFileDialog savefiledialog = new SaveFileDialog();\r
             savefiledialog.Filter = "plist|*.plist";\r
 \r
             if (treeView_presets.SelectedNode != null)\r
@@ -921,7 +924,7 @@ namespace Handbrake
                     Preset preset = presetHandler.GetPreset(treeView_presets.SelectedNode.Text);\r
                     PlistPresetHandler.Export(savefiledialog.FileName, preset);\r
                 }\r
-            }\r
+            }*/\r
         }\r
 \r
         #endregion\r
@@ -1126,7 +1129,6 @@ namespace Handbrake
             lbl_encode.Text = encodeQueue.Count + " encode(s) pending in the queue";\r
 \r
             queueWindow.Show();\r
-\r
         }\r
 \r
         /// <summary>\r
@@ -1288,7 +1290,6 @@ namespace Handbrake
                 int id;\r
                 if (int.TryParse(driveId, out id))\r
                 {\r
-\r
                     this.dvdDrivePath = drives[id].RootDirectory;\r
                     this.dvdDriveLabel = drives[id].VolumeLabel;\r
 \r
@@ -1761,7 +1762,7 @@ namespace Handbrake
             }\r
         }\r
 \r
-        private double _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+        private double cachedCqStep = Properties.Settings.Default.x264cqstep;\r
 \r
         /// <summary>\r
         /// Update the CQ slider for x264 for a new CQ step. This is set from option\r
@@ -1769,7 +1770,7 @@ namespace Handbrake
         public void setQualityFromSlider()\r
         {\r
             // Work out the current RF value.\r
-            double cqStep = _cachedCqStep;\r
+            double cqStep = this.cachedCqStep;\r
             double rfValue = 51.0 - slider_videoQuality.Value * cqStep;\r
 \r
             // Change the maximum value for the slider\r
@@ -1788,7 +1789,7 @@ namespace Handbrake
             }\r
 \r
             // Cache the CQ step for the next calculation\r
-            _cachedCqStep = Properties.Settings.Default.x264cqstep;\r
+            this.cachedCqStep = Properties.Settings.Default.x264cqstep;\r
         }\r
 \r
         private void slider_videoQuality_Scroll(object sender, EventArgs e)\r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 4475d90..6af23b0 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -10,12 +10,15 @@ namespace Handbrake
     using System.Diagnostics;\r
     using System.Globalization;\r
     using System.Windows.Forms;\r
-    using Functions;\r
 \r
     using HandBrake.ApplicationServices;\r
 \r
+    using Handbrake.Functions;\r
     using Handbrake.Properties;\r
 \r
+    /// <summary>\r
+    /// The Options Window\r
+    /// </summary>\r
     public partial class frmOptions : Form\r
     {\r
         private frmMain mainWindow;\r

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 7d52dde..e4c5089 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -425,6 +425,7 @@ namespace Handbrake
         }\r
 \r
         /* Right Click Menu */\r
+\r
         /// <summary>\r
         /// Handle the Move Up Menu Item\r
         /// </summary>\r