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://svn.handbrake.fr/HandBrake/trunk@3272 b64f7644-9d1e-0410-96f1-a4d463321fa5

9 files changed, 337 insertions, 50 deletions

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index e9e36d1a2..cb82a4bad 100644
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -215,6 +215,14 @@ namespace Handbrake.Functions
                 }

             }

 

+            foreach (char character in Path.GetInvalidFileNameChars())

+            {

+                if (autoNamePath != null)

+                {

+                    autoNamePath = autoNamePath.Replace(character.ToString(), string.Empty);

+                }

+            }

+

             return autoNamePath;

         }

 

@@ -306,7 +314,7 @@ namespace Handbrake.Functions
                     MessageBox.Show(

                         "It appears you are trying to use a CLI executable that is too old for this version of the HandBrake GUI.\n" +

                         "Please update the HandBrakeCLI.exe to a newer build.\n\n" +

-                        "HandBrake Detected: " + Properties.Settings.Default.hb_version,

+                        "HandBrake build Detected: " + Properties.Settings.Default.hb_version,

                         "Error",

                         MessageBoxButtons.OK,

                         MessageBoxIcon.Error);

diff --git a/win/C#/HandBrakeCS.5.0.ReSharper b/win/C#/HandBrakeCS.5.0.ReSharper
index 9826bd36b..59f681991 100644
--- a/win/C#/HandBrakeCS.5.0.ReSharper
+++ b/win/C#/HandBrakeCS.5.0.ReSharper
@@ -5,6 +5,20 @@
     <Sharing>SOLUTION</Sharing>

     <CSharp>

       <FormatSettings>

+        <ALIGN_MULTILINE_ARGUMENT>False</ALIGN_MULTILINE_ARGUMENT>

+        <BLANK_LINES_AROUND_SINGLE_LINE_FIELD>1</BLANK_LINES_AROUND_SINGLE_LINE_FIELD>

+        <BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>1</BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE>

+        <BLANK_LINES_BETWEEN_USING_GROUPS>1</BLANK_LINES_BETWEEN_USING_GROUPS>

+        <FORCE_ATTRIBUTE_STYLE>SEPARATE</FORCE_ATTRIBUTE_STYLE>

+        <FORCE_FOR_BRACES_STYLE>ALWAYS_ADD</FORCE_FOR_BRACES_STYLE>

+        <FORCE_FOREACH_BRACES_STYLE>ALWAYS_ADD</FORCE_FOREACH_BRACES_STYLE>

+        <FORCE_IFELSE_BRACES_STYLE>ALWAYS_ADD</FORCE_IFELSE_BRACES_STYLE>

+        <FORCE_WHILE_BRACES_STYLE>ALWAYS_ADD</FORCE_WHILE_BRACES_STYLE>

+        <INDENT_ANONYMOUS_METHOD_BLOCK>False</INDENT_ANONYMOUS_METHOD_BLOCK>

+        <INDENT_EMBRACED_INITIALIZER_BLOCK>False</INDENT_EMBRACED_INITIALIZER_BLOCK>

+        <KEEP_BLANK_LINES_IN_CODE>1</KEEP_BLANK_LINES_IN_CODE>

+        <KEEP_BLANK_LINES_IN_DECLARATIONS>1</KEEP_BLANK_LINES_IN_DECLARATIONS>

+        <KEEP_USER_LINEBREAKS>False</KEEP_USER_LINEBREAKS>

         <MODIFIERS_ORDER IsNull="False">

           <Item>public</Item>

           <Item>protected</Item>

@@ -21,13 +35,36 @@
           <Item>unsafe</Item>

           <Item>volatile</Item>

         </MODIFIERS_ORDER>

+        <PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>False</PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE>

+        <PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>False</PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE>

+        <PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>False</PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE>

+        <PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>False</PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE>

+        <PLACE_WHILE_ON_NEW_LINE>True</PLACE_WHILE_ON_NEW_LINE>

+        <REDUNDANT_THIS_QUALIFIER_STYLE>ALWAYS_USE</REDUNDANT_THIS_QUALIFIER_STYLE>

+        <SIMPLE_EMBEDDED_STATEMENT_STYLE>ON_SINGLE_LINE</SIMPLE_EMBEDDED_STATEMENT_STYLE>

+        <SPACE_AFTER_TYPECAST_PARENTHESES>False</SPACE_AFTER_TYPECAST_PARENTHESES>

+        <SPACE_AROUND_MULTIPLICATIVE_OP>True</SPACE_AROUND_MULTIPLICATIVE_OP>

+        <SPACE_BEFORE_SIZEOF_PARENTHESES>False</SPACE_BEFORE_SIZEOF_PARENTHESES>

+        <SPACE_BEFORE_TYPEOF_PARENTHESES>False</SPACE_BEFORE_TYPEOF_PARENTHESES>

+        <SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>True</SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES>

+        <STICK_COMMENT>False</STICK_COMMENT>

+        <WRAP_AFTER_DECLARATION_LPAR>True</WRAP_AFTER_DECLARATION_LPAR>

+        <WRAP_AFTER_INVOCATION_LPAR>True</WRAP_AFTER_INVOCATION_LPAR>

+        <WRAP_ARGUMENTS_STYLE>CHOP_IF_LONG</WRAP_ARGUMENTS_STYLE>

+        <WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>True</WRAP_BEFORE_FIRST_TYPE_PARAMETER_CONSTRAINT>

+        <WRAP_EXTENDS_LIST_STYLE>CHOP_IF_LONG</WRAP_EXTENDS_LIST_STYLE>

+        <WRAP_PARAMETERS_STYLE>CHOP_IF_LONG</WRAP_PARAMETERS_STYLE>

       </FormatSettings>

       <UsingsSettings>

         <AddImportsToDeepestScope>True</AddImportsToDeepestScope>

+        <QualifiedUsingAtNestedScope>True</QualifiedUsingAtNestedScope>

       </UsingsSettings>

       <Naming2>

         <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>

         <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>

+        <ExceptionName IsNull="False">

+        </ExceptionName>

+        <OverrideDefaultSettings>True</OverrideDefaultSettings>

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />

         <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />

         <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />

@@ -36,15 +73,267 @@
         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />

-        <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />

-        <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />

         <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />

+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />

+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />

+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />

+        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />

       </Naming2>

+      <CustomMemberReorderingPatterns><![CDATA[<?xml version="1.0" encoding="utf-8"?>

+<Patterns xmlns="urn:shemas-jetbrains-com:member-reordering-patterns">

+

+    <!-- Do not reorder COM interfaces -->

+    <Pattern>

+        <Match>

+            <And Weight="2000">

+                <Kind Is="interface"/>

+                <HasAttribute CLRName="System.Runtime.InteropServices.InterfaceTypeAttribute"

+                              Inherit="true"/>

+            </And>

+        </Match>

+    </Pattern>

+

+    <!-- Do not reorder P/Invoke structs -->

+    <Pattern>

+        <Match>

+            <And Weight="2000">

+                <Or>

+                    <Kind Is="struct"/>

+                    <Kind Is="class"/>

+                </Or>

+                <HasAttribute CLRName="System.Runtime.InteropServices.StructLayoutAttribute"

+                              Inherit="true"/>

+            </And>

+        </Match>

+    </Pattern>

+

+    <!-- Do not reorder P/Invoke classes (called xxxNativeMethods) -->

+    <Pattern>

+        <Match>

+            <And Weight="2000">

+                <Kind Is="class"/>

+                <Name Is=".*NativeMethods" />

+            </And>

+        </Match>

+    </Pattern>

+

+    <!-- StyleCop pattern -->

+    <Pattern RemoveAllRegions="true">

+        <Match>

+            <Or Weight="1000" >

+                <Kind Is="class" />

+                <Kind Is="struct" />

+                <Kind Is="interface"/>

+            </Or>

+        </Match>

+

+        <!-- constants and fields -->

+        <Entry>

+            <Match>

+                <Or>

+                    <Kind Is="constant"/>

+                    <Kind Is="field"/>

+                </Or>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private"/>

+                <Kind Order="constant field"/>

+                <Readonly/>

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Constants and Fields"/>

+        </Entry>

+

+        <!-- constructors -->

+        <Entry>

+            <Match>

+                <Or Weight="200">

+                    <Kind Is="constructor"/>

+                    <Kind Is="destructor"/>

+                </Or>

+            </Match>

+            <Sort>

+                <Static/>

+                <Kind Order="constructor destructor"/>

+                <Access Order="public internal protected-internal protected private"/>

+            </Sort>

+            <Group Region="Constructors and Destructors"/>

+        </Entry>

+

+        <!-- delegates -->

+        <Entry>

+            <Match>

+                <Kind Is="delegate"/>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private" />

+                <Static />

+                <Name/>

+            </Sort>

+            <Group Region="Delegates"/>

+        </Entry>

+

+        <!-- events -->

+        <Entry>

+            <Match>

+                <Kind Is="event"/>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private" />

+                <Static />

+                <Name/>

+            </Sort>

+            <Group Region="Events"/>

+        </Entry>

+

+        <!-- enum -->

+        <Entry>

+            <Match>

+                <Kind Is="enum"/>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private" />

+                <Name/>

+            </Sort>

+            <Group Region="Enums"/>

+        </Entry>

+

+        <!-- interfaces -->

+        <Entry>

+            <Match>

+                <Kind Is="interface" />

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private" />

+                <Name/>

+            </Sort>

+            <Group Region="Interfaces"/>

+        </Entry>

+

+        <!-- properties -->

+        <Entry>

+            <Match>

+                <Kind Is="property"/>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private"/>

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Properties"/>

+        </Entry>

+

+        <!-- indexers -->

+        <Entry>

+            <Match>

+                <Kind Is="indexer"

+                      Weight="300" />

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private" />

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Indexers"/>

+        </Entry>

+

+        <!-- operator -->

+        <Entry>

+            <Match>

+                <Kind Is="operator"/>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private" />

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Operators"/>

+        </Entry>

+

+        <!-- public methods -->

+        <Entry>

+            <Match>

+                <And>

+                    <Kind Is="method"/>

+                    <Access Is="public"/>

+                </And>

+            </Match>

+            <Sort>

+                <Access Order="public"/>

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Public Methods"/>

+        </Entry>

+

+        <!-- Implemented Interfaces -->

+        <Entry>

+            <Match>

+                <And Weight="500">

+                    <Kind Is="method"/>

+                    <ImplementsInterface CLRName=".*"/>

+                </And>

+            </Match>

+            <Sort>

+                <ImplementsInterface />

+                <Access Order="public internal protected-internal protected private"/>

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Implemented Interfaces">

+                <ImplementsInterface Region="${ImplementsInterface}" />

+            </Group>

+        </Entry>

+

+        <!-- other methods -->

+        <Entry>

+            <Match>

+                <Kind Is="method"/>

+            </Match>

+            <Sort>

+                <Access Order="public internal protected-internal protected private"/>

+                <Static/>

+                <Name/>

+            </Sort>

+            <Group Region="Methods"/>

+        </Entry>

+

+        <!-- Nested structs -->

+        <Entry>

+            <Match>

+                <Kind Is="struct"

+                      Weight="600" />

+            </Match>

+            <Sort>

+                <Static />

+                <Access Order="public internal protected-internal protected private" />

+                <Name/>

+            </Sort>

+        </Entry>

+

+        <!-- Nested classes -->

+        <Entry>

+            <Match>

+                <Kind Is="class"

+                      Weight="700" />

+            </Match>

+            <Sort>

+                <Static />

+                <Access Order="public internal protected-internal protected private" />

+                <Name/>

+            </Sort>

+        </Entry>

+

+        <!-- all other members -->

+        <Entry/>

+

+    </Pattern>

+</Patterns>

+]]></CustomMemberReorderingPatterns>

     </CSharp>

     <VB>

       <FormatSettings />

@@ -52,22 +341,6 @@
       <Naming2>

         <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>

         <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />

-        <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />

-        <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />

-        <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />

-        <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />

-        <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />

       </Naming2>

     </VB>

     <Web>

@@ -87,24 +360,24 @@
     <Naming2>

       <EventHandlerPatternLong>$object$_On$event$</EventHandlerPatternLong>

       <EventHandlerPatternShort>$event$Handler</EventHandlerPatternShort>

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces">

-        <ExtraRule Prefix="frm" Suffix="" Style="AaBb" />

-      </PredefinedRule>

-      <PredefinedRule Inspect="True" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />

-      <PredefinedRule Inspect="True" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PublicFields" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />

+      <ExceptionName IsNull="False">

+      </ExceptionName>

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Locals" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="Parameters" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="TypesAndNamespaces" />

+      <PredefinedRule Inspect="False" Prefix="I" Suffix="" Style="AaBb" ElementKind="Interfaces" />

+      <PredefinedRule Inspect="False" Prefix="T" Suffix="" Style="AaBb" ElementKind="TypeParameters" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="MethodPropertyEvent" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="aaBb" ElementKind="LocalConstants" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="PublicFields" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Constants" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />

+      <PredefinedRule Inspect="False" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />

       <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateConstants" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="StaticReadonly" />

+      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateInstanceFields" />

+      <PredefinedRule Inspect="True" Prefix="_" Suffix="" Style="aaBb" ElementKind="PrivateStaticFields" />

       <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="PrivateStaticReadonly" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="EnumMember" />

-      <PredefinedRule Inspect="True" Prefix="" Suffix="" Style="AaBb" ElementKind="Other" />

       <Abbreviation Text="CLI" />

       <Abbreviation Text="DRC" />

       <Abbreviation Text="ID" />

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 44b8113ab..575216de1 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -135,9 +135,13 @@
   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|AnyCPU'">

     <OutputPath>bin\NightlyBuild\</OutputPath>

+    <Optimize>false</Optimize>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NightlyBuild|x86'">

     <OutputPath>bin\x86\NightlyBuild\</OutputPath>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <Optimize>true</Optimize>

   </PropertyGroup>

   <ItemGroup>

     <Reference Include="Growl.Connector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=980c2339411be384, processorArchitecture=x86">

@@ -506,7 +510,9 @@
 	</PostBuildEvent>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)' == 'NightlyBuild' ">

-    <PreBuildEvent>subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"

+    <PreBuildEvent>

+	subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"

+	subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"

 subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>

   </PropertyGroup>

 </Project>
\ No newline at end of file
diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index 85dbe5e50..cbf7cf5fd 100644
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -38,5 +38,5 @@ using System.Runtime.InteropServices;
 //      Revision

 //

 

-[assembly: AssemblyVersion("0.9.4.3247")]

+[assembly: AssemblyVersion("0.9.4.3265")]

 [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 757344c75..018b95e3a 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:4.0.30128.1

+//     Runtime Version:4.0.30319.1

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -527,7 +527,7 @@ namespace Handbrake.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Configuration.DefaultSettingValueAttribute("3240")]

+        [global::System.Configuration.DefaultSettingValueAttribute("3264")]

         public int hb_min_cli {

             get {

                 return ((int)(this["hb_min_cli"]));

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index bab3f7db1..cc7649fe7 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -129,7 +129,7 @@
       <Value Profile="(Default)">False</Value>

     </Setting>

     <Setting Name="hb_min_cli" Type="System.Int32" Scope="User">

-      <Value Profile="(Default)">3240</Value>

+      <Value Profile="(Default)">3264</Value>

     </Setting>

   </Settings>

 </SettingsFile>
\ No newline at end of file
diff --git a/win/C#/Settings.StyleCop b/win/C#/Settings.StyleCop
index 25f6771ef..90f8bc063 100644
--- a/win/C#/Settings.StyleCop
+++ b/win/C#/Settings.StyleCop
@@ -130,11 +130,6 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>

           </RuleSettings>

         </Rule>

-        <Rule Name="PrefixLocalCallsWithThis">

-          <RuleSettings>

-            <BooleanProperty Name="Enabled">False</BooleanProperty>

-          </RuleSettings>

-        </Rule>

         <Rule Name="ParametersMustBeOnSameLineOrSeparateLines">

           <RuleSettings>

             <BooleanProperty Name="Enabled">False</BooleanProperty>

diff --git a/win/C#/app.config b/win/C#/app.config
index 73fd12e1f..6a9c862c3 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -135,7 +135,7 @@
         <value>False</value>

       </setting>

       <setting name="hb_min_cli" serializeAs="String">

-        <value>3240</value>

+        <value>3264</value>

       </setting>

     </Handbrake.Properties.Settings>

   </userSettings>

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index f3dd454bb..3e7c2209a 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -12,6 +12,7 @@ namespace Handbrake
     using System.Drawing;

     using System.Globalization;

     using System.IO;

+    using System.Reflection;

     using System.Threading;

     using System.Windows.Forms;

     using Functions;

@@ -61,12 +62,14 @@ namespace Handbrake
             InitializeComponent();

 

             // Update the users config file with the CLI version data.

-            lblStatus.Text = "Updating and Checking CLI Version Data ...";

+            lblStatus.Text = "Checking CLI Version Data ...";

             Application.DoEvents();

             Main.SetCliVersionData();

             Main.CheckForValidCliVersion();

+            Version v = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;

+            this.Text += " " + v.ToString(4);

 

-            // Show the form, but leave disabled until preloading is complete then show the main form

+            // Show the form, but leave disabled until preloading is complete then show the main form)

             this.Enabled = false;

             this.Show();

             Application.DoEvents(); // Forces frmMain to draw

@@ -987,6 +990,8 @@ namespace Handbrake
             this.Activate();

             this.WindowState = FormWindowState.Normal;

             notifyIcon.Visible = false;

+

+            this.StartScan(null, 2);

         }

 

         #endregion