WinGui:

- Just a few small changes.

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

5 files changed, 123 insertions, 6 deletions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 10e4b29d6..9a06ede4f 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -168,6 +168,7 @@
   </ItemGroup>

   <ItemGroup>

     <Content Include="handbrakepineapple.ico" />

+    <None Include="splash.jpg" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 619650ebf..845bedbbf 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -59,5 +59,12 @@ namespace Handbrake.Properties {
                 resourceCulture = value;

             }

         }

+        

+        internal static System.Drawing.Bitmap splash {

+            get {

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

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

+            }

+        }

     }

 }

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index ffecec851..ede73750e 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -46,7 +46,7 @@
     

     mimetype: application/x-microsoft.net.object.binary.base64

     value   : The object must be serialized with 

-            : System.Serialization.Formatters.Binary.BinaryFormatter

+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter

             : and then encoded with base64 encoding.

     

     mimetype: application/x-microsoft.net.object.soap.base64

@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.

     -->

   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />

     <xsd:element name="root" msdata:IsDataSet="true">

       <xsd:complexType>

         <xsd:choice maxOccurs="unbounded">

@@ -68,9 +69,10 @@
               <xsd:sequence>

                 <xsd:element name="value" type="xsd:string" minOccurs="0" />

               </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" />

+              <xsd:attribute name="name" use="required" type="xsd:string" />

               <xsd:attribute name="type" type="xsd:string" />

               <xsd:attribute name="mimetype" type="xsd:string" />

+              <xsd:attribute ref="xml:space" />

             </xsd:complexType>

           </xsd:element>

           <xsd:element name="assembly">

@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

               </xsd:sequence>

-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />

               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+              <xsd:attribute ref="xml:space" />

             </xsd:complexType>

           </xsd:element>

           <xsd:element name="resheader">

@@ -114,4 +117,8 @@
   <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

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

+    <value>..\splash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index 56cfb3a2a..75c53b535 100644
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -29,20 +29,119 @@ namespace Handbrake
         private void InitializeComponent()

         {

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSplashScreen));

+            this.productName = new System.Windows.Forms.Label();

+            this.cliVersion = new System.Windows.Forms.Label();

+            this.guiVerison = new System.Windows.Forms.Label();

+            this.label2 = new System.Windows.Forms.Label();

+            this.label3 = new System.Windows.Forms.Label();

+            this.label1 = new System.Windows.Forms.Label();

+            this.label4 = new System.Windows.Forms.Label();

             this.SuspendLayout();

             // 

-            // SplashScreen

+            // productName

+            // 

+            this.productName.AutoSize = true;

+            this.productName.Font = new System.Drawing.Font("Verdana", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.productName.Location = new System.Drawing.Point(177, 69);

+            this.productName.Name = "productName";

+            this.productName.Size = new System.Drawing.Size(180, 32);

+            this.productName.TabIndex = 0;

+            this.productName.Text = "Handbrake";

+            // 

+            // cliVersion

+            // 

+            this.cliVersion.AutoSize = true;

+            this.cliVersion.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.cliVersion.Location = new System.Drawing.Point(180, 197);

+            this.cliVersion.Name = "cliVersion";

+            this.cliVersion.Size = new System.Drawing.Size(145, 13);

+            this.cliVersion.TabIndex = 1;

+            this.cliVersion.Text = "Handbrake CLI Version:";

+            // 

+            // guiVerison

+            // 

+            this.guiVerison.AutoSize = true;

+            this.guiVerison.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.guiVerison.Location = new System.Drawing.Point(180, 170);

+            this.guiVerison.Name = "guiVerison";

+            this.guiVerison.Size = new System.Drawing.Size(55, 13);

+            this.guiVerison.TabIndex = 2;

+            this.guiVerison.Text = "Version:";

+            // 

+            // label2

+            // 

+            this.label2.AutoSize = true;

+            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label2.Location = new System.Drawing.Point(331, 197);

+            this.label2.Name = "label2";

+            this.label2.Size = new System.Drawing.Size(88, 13);

+            this.label2.TabIndex = 4;

+            this.label2.Text = "{CLI Version}";

+            // 

+            // label3

+            // 

+            this.label3.AutoSize = true;

+            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label3.Location = new System.Drawing.Point(331, 170);

+            this.label3.Name = "label3";

+            this.label3.Size = new System.Drawing.Size(90, 13);

+            this.label3.TabIndex = 5;

+            this.label3.Text = "{GUI Version}";

+            // 

+            // label1

+            // 

+            this.label1.AutoSize = true;

+            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label1.Location = new System.Drawing.Point(418, 170);

+            this.label1.Name = "label1";

+            this.label1.Size = new System.Drawing.Size(43, 13);

+            this.label1.TabIndex = 6;

+            this.label1.Text = "(Beta)";

+            // 

+            // label4

+            // 

+            this.label4.AutoSize = true;

+            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

+            this.label4.Location = new System.Drawing.Point(418, 197);

+            this.label4.Name = "label4";

+            this.label4.Size = new System.Drawing.Size(43, 13);

+            this.label4.TabIndex = 7;

+            this.label4.Text = "(Beta)";

+            // 

+            // frmSplashScreen

             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(292, 266);

+            this.BackColor = System.Drawing.Color.White;

+            this.BackgroundImage = global::Handbrake.Properties.Resources.splash;

+            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;

+            this.ClientSize = new System.Drawing.Size(496, 276);

+            this.ControlBox = false;

+            this.Controls.Add(this.label4);

+            this.Controls.Add(this.label1);

+            this.Controls.Add(this.label3);

+            this.Controls.Add(this.label2);

+            this.Controls.Add(this.guiVerison);

+            this.Controls.Add(this.cliVersion);

+            this.Controls.Add(this.productName);

+            this.Font = new System.Drawing.Font("Corbel", 8.25F);

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

-            this.Name = "SplashScreen";

+            this.Name = "frmSplashScreen";

             this.Text = "SplashScreen";

             this.ResumeLayout(false);

+            this.PerformLayout();

 

         }

 

         #endregion

+

+        private System.Windows.Forms.Label productName;

+        private System.Windows.Forms.Label cliVersion;

+        private System.Windows.Forms.Label guiVerison;

+        private System.Windows.Forms.Label label2;

+        private System.Windows.Forms.Label label3;

+        private System.Windows.Forms.Label label1;

+        private System.Windows.Forms.Label label4;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmSplashScreen.cs b/win/C#/frmSplashScreen.cs
index b0e681251..65ca835b2 100644
--- a/win/C#/frmSplashScreen.cs
+++ b/win/C#/frmSplashScreen.cs
@@ -5,6 +5,7 @@ using System.Data;
 using System.Drawing;

 using System.Text;

 using System.Windows.Forms;

+using System.Threading;

 

 namespace Handbrake

 {

@@ -14,5 +15,7 @@ namespace Handbrake
         {

             InitializeComponent();

         }

+

+           

     }

 }
\ No newline at end of file