WinGui:

- Strip any illegal characters from the autoname path
- Display build number in program window title. Also added a hack to force this to display the correct number.
- Imported some settings for Stylecop for resharper 5

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

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index e9e36d1..cb82a4b 100644 (file)
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -215,6 +215,14 @@ namespace Handbrake.Functions
                 }\r
             }\r
 \r
+            foreach (char character in Path.GetInvalidFileNameChars())\r
+            {\r
+                if (autoNamePath != null)\r
+                {\r
+                    autoNamePath = autoNamePath.Replace(character.ToString(), string.Empty);\r
+                }\r
+            }\r
+\r
             return autoNamePath;\r
         }\r
 \r
@@ -306,7 +314,7 @@ namespace Handbrake.Functions
                     MessageBox.Show(\r
                         "It appears you are trying to use a CLI executable that is too old for this version of the HandBrake GUI.\n" +\r
                         "Please update the HandBrakeCLI.exe to a newer build.\n\n" +\r
-                        "HandBrake Detected: " + Properties.Settings.Default.hb_version,\r
+                        "HandBrake build Detected: " + Properties.Settings.Default.hb_version,\r
                         "Error",\r
                         MessageBoxButtons.OK,\r
                         MessageBoxIcon.Error);\r

diff --git a/win/C#/HandBrakeCS.5.0.ReSharper b/win/C#/HandBrakeCS.5.0.ReSharper
index 9826bd3..59f6819 100644 (file)
--- a/win/C#/HandBrakeCS.5.0.ReSharper
+++ b/win/C#/HandBrakeCS.5.0.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,13 +35,36 @@
           <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
@@ -36,15 +73,267 @@
         <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="PrivateInstanceFields" />\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
+        <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
@@ -52,22 +341,6 @@
       <Naming2>\r
         <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
         <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\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="PrivateInstanceFields" />\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
     </VB>\r
     <Web>\r
@@ -87,24 +360,24 @@
     <Naming2>\r
       <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>\r
       <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces">\r
-        <ExtraRule Prefix="frm" Suffix="" Style="AaBb" />\r
-      </PredefinedRule>\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="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="PrivateInstanceFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />\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="StaticReadonly" />\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
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />\r
-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />\r
       <Abbreviation Text="CLI" />\r
       <Abbreviation Text="DRC" />\r
       <Abbreviation Text="ID" />\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 44b8113..575216d 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -135,9 +135,13 @@
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">\r
     <OutputPath>bin\NightlyBuild\</OutputPath>\r
+    <Optimize>false</Optimize>\r
+    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">\r
     <OutputPath>bin\x86\NightlyBuild\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG</DefineConstants>\r
+    <Optimize>true</Optimize>\r
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">\r
@@ -506,7 +510,9 @@
        </PostBuildEvent>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)' == 'NightlyBuild' ">\r
-    <PreBuildEvent>subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
+    <PreBuildEvent>\r
+       subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
+       subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"\r
 subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>\r
   </PropertyGroup>\r
 </Project>
\ No newline at end of file

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index 85dbe5e..cbf7cf5 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@ using System.Runtime.InteropServices;
 //      Revision\r
 //\r
 \r
-[assembly: AssemblyVersion("0.9.4.3247")]\r
+[assembly: AssemblyVersion("0.9.4.3265")]\r
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 757344c..018b95e 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------\r
 // <auto-generated>\r
 //     This code was generated by a tool.\r
-//     Runtime Version:4.0.30128.1\r
+//     Runtime Version:4.0.30319.1\r
 //\r
 //     Changes to this file may cause incorrect behavior and will be lost if\r
 //     the code is regenerated.\r
@@ -527,7 +527,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("3240")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("3264")]\r
         public int hb_min_cli {\r
             get {\r
                 return ((int)(this["hb_min_cli"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index bab3f7d..cc7649f 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -129,7 +129,7 @@
       <Value Profile="(Default)">False</Value>\r
     </Setting>\r
     <Setting Name="hb_min_cli" Type="System.Int32" Scope="User">\r
-      <Value Profile="(Default)">3240</Value>\r
+      <Value Profile="(Default)">3264</Value>\r
     </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/Settings.StyleCop b/win/C#/Settings.StyleCop
index 25f6771..90f8bc0 100644 (file)
--- a/win/C#/Settings.StyleCop
+++ b/win/C#/Settings.StyleCop
@@ -130,11 +130,6 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>\r
           </RuleSettings>\r
         </Rule>\r
-        <Rule Name="PrefixLocalCallsWithThis">\r
-          <RuleSettings>\r
-            <BooleanProperty Name="Enabled">False</BooleanProperty>\r
-          </RuleSettings>\r
-        </Rule>\r
         <Rule Name="ParametersMustBeOnSameLineOrSeparateLines">\r
           <RuleSettings>\r
             <BooleanProperty Name="Enabled">False</BooleanProperty>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index 73fd12e..6a9c862 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -135,7 +135,7 @@
         <value>False</value>\r
       </setting>\r
       <setting name="hb_min_cli" serializeAs="String">\r
-        <value>3240</value>\r
+        <value>3264</value>\r
       </setting>\r
     </Handbrake.Properties.Settings>\r
   </userSettings>\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index f3dd454..3e7c220 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,6 +12,7 @@ namespace Handbrake
     using System.Drawing;\r
     using System.Globalization;\r
     using System.IO;\r
+    using System.Reflection;\r
     using System.Threading;\r
     using System.Windows.Forms;\r
     using Functions;\r
@@ -61,12 +62,14 @@ namespace Handbrake
             InitializeComponent();\r
 \r
             // Update the users config file with the CLI version data.\r
-            lblStatus.Text = "Updating and Checking CLI Version Data ...";\r
+            lblStatus.Text = "Checking CLI Version Data ...";\r
             Application.DoEvents();\r
             Main.SetCliVersionData();\r
             Main.CheckForValidCliVersion();\r
+            Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;\r
+            this.Text += " " + v.ToString(4);\r
 \r
-            // Show the form, but leave disabled until preloading is complete then show the main form\r
+            // Show the form, but leave disabled until preloading is complete then show the main form)\r
             this.Enabled = false;\r
             this.Show();\r
             Application.DoEvents(); // Forces frmMain to draw\r
@@ -987,6 +990,8 @@ namespace Handbrake
             this.Activate();\r
             this.WindowState = FormWindowState.Normal;\r
             notifyIcon.Visible = false;\r
+\r
+            this.StartScan(null, 2);\r
         }\r
 \r
         #endregion\r