WinGui:

- Remove the old school splash screen. Doesn't really serve a purpose now.
- Added Jobs Pending to the current Encode status string in the Main window task bar.
- Some minor refactoring. 

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3444 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 3 insertions, 14 deletions

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 4dc4fc937..5edd69875 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:4.0.30319.1

+//     Runtime Version:2.0.50727.4927

 //

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

 //     the code is regenerated.

@@ -19,7 +19,7 @@ namespace Handbrake.Properties {
     // class via a tool like ResGen or Visual Studio.

     // To add or remove a member, edit your .ResX file then rerun ResGen

     // with the /str option, or rebuild your VS project.

-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]

+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]

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

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

     internal class Resources {

@@ -256,13 +256,6 @@ namespace Handbrake.Properties {
             }

         }

         

-        internal static System.Drawing.Bitmap SplashScreen {

-            get {

-                object obj = ResourceManager.GetObject("SplashScreen", resourceCulture);

-                return ((System.Drawing.Bitmap)(obj));

-            }

-        }

-        

         internal static System.Drawing.Bitmap stop {

             get {

                 object obj = ResourceManager.GetObject("stop", resourceCulture);

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index 6a320d631..68312651e 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -117,7 +117,7 @@
   <resheader name="writer">

     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

   </resheader>

-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="General_Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

@@ -133,9 +133,6 @@
   <data name="Pause" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\Pause.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

-  <data name="SplashScreen" type="System.Resources.ResXFileRef, System.Windows.Forms">

-    <value>..\Resources\SplashScreen.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

-  </data>

   <data name="Output_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\Output_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

@@ -208,7 +205,6 @@
   <data name="logo128" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\logo128.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

   <data name="ErrorX" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\ErrorX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>