WinGui:

- Just a few small changes.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 10e4b29..9a06ede 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -168,6 +168,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="handbrakepineapple.ico" />\r
+    <None Include="splash.jpg" />\r
   </ItemGroup>\r
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 619650e..845bedb 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -59,5 +59,12 @@ namespace Handbrake.Properties {
                 resourceCulture = value;\r
             }\r
         }\r
+        \r
+        internal static System.Drawing.Bitmap splash {\r
+            get {\r
+                object obj = ResourceManager.GetObject("splash", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index ffecec8..ede7375 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -46,7 +46,7 @@
     \r
     mimetype: application/x-microsoft.net.object.binary.base64\r
     value   : The object must be serialized with \r
-            : System.Serialization.Formatters.Binary.BinaryFormatter\r
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter\r
             : and then encoded with base64 encoding.\r
     \r
     mimetype: application/x-microsoft.net.object.soap.base64\r
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.\r
     -->\r
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">\r
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />\r
     <xsd:element name="root" msdata:IsDataSet="true">\r
       <xsd:complexType>\r
         <xsd:choice maxOccurs="unbounded">\r
@@ -68,9 +69,10 @@
               <xsd:sequence>\r
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />\r
               </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" />\r
+              <xsd:attribute name="name" use="required" type="xsd:string" />\r
               <xsd:attribute name="type" type="xsd:string" />\r
               <xsd:attribute name="mimetype" type="xsd:string" />\r
+              <xsd:attribute ref="xml:space" />\r
             </xsd:complexType>\r
           </xsd:element>\r
           <xsd:element name="assembly">\r
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />\r
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />\r
               </xsd:sequence>\r
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />\r
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />\r
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />\r
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />\r
+              <xsd:attribute ref="xml:space" />\r
             </xsd:complexType>\r
           </xsd:element>\r
           <xsd:element name="resheader">\r
@@ -114,4 +117,8 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />\r
+  <data name="splash" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\splash.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/frmSplashScreen.Designer.cs b/win/C#/frmSplashScreen.Designer.cs
index 56cfb3a..75c53b5 100644 (file)
--- a/win/C#/frmSplashScreen.Designer.cs
+++ b/win/C#/frmSplashScreen.Designer.cs
@@ -29,20 +29,119 @@ namespace Handbrake
         private void InitializeComponent()\r
         {\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSplashScreen));\r
+            this.productName = new System.Windows.Forms.Label();\r
+            this.cliVersion = new System.Windows.Forms.Label();\r
+            this.guiVerison = new System.Windows.Forms.Label();\r
+            this.label2 = new System.Windows.Forms.Label();\r
+            this.label3 = new System.Windows.Forms.Label();\r
+            this.label1 = new System.Windows.Forms.Label();\r
+            this.label4 = new System.Windows.Forms.Label();\r
             this.SuspendLayout();\r
             // \r
-            // SplashScreen\r
+            // productName\r
+            // \r
+            this.productName.AutoSize = true;\r
+            this.productName.Font = new System.Drawing.Font("Verdana", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.productName.Location = new System.Drawing.Point(177, 69);\r
+            this.productName.Name = "productName";\r
+            this.productName.Size = new System.Drawing.Size(180, 32);\r
+            this.productName.TabIndex = 0;\r
+            this.productName.Text = "Handbrake";\r
+            // \r
+            // cliVersion\r
+            // \r
+            this.cliVersion.AutoSize = true;\r
+            this.cliVersion.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.cliVersion.Location = new System.Drawing.Point(180, 197);\r
+            this.cliVersion.Name = "cliVersion";\r
+            this.cliVersion.Size = new System.Drawing.Size(145, 13);\r
+            this.cliVersion.TabIndex = 1;\r
+            this.cliVersion.Text = "Handbrake CLI Version:";\r
+            // \r
+            // guiVerison\r
+            // \r
+            this.guiVerison.AutoSize = true;\r
+            this.guiVerison.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.guiVerison.Location = new System.Drawing.Point(180, 170);\r
+            this.guiVerison.Name = "guiVerison";\r
+            this.guiVerison.Size = new System.Drawing.Size(55, 13);\r
+            this.guiVerison.TabIndex = 2;\r
+            this.guiVerison.Text = "Version:";\r
+            // \r
+            // label2\r
+            // \r
+            this.label2.AutoSize = true;\r
+            this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label2.Location = new System.Drawing.Point(331, 197);\r
+            this.label2.Name = "label2";\r
+            this.label2.Size = new System.Drawing.Size(88, 13);\r
+            this.label2.TabIndex = 4;\r
+            this.label2.Text = "{CLI Version}";\r
+            // \r
+            // label3\r
+            // \r
+            this.label3.AutoSize = true;\r
+            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label3.Location = new System.Drawing.Point(331, 170);\r
+            this.label3.Name = "label3";\r
+            this.label3.Size = new System.Drawing.Size(90, 13);\r
+            this.label3.TabIndex = 5;\r
+            this.label3.Text = "{GUI Version}";\r
+            // \r
+            // label1\r
+            // \r
+            this.label1.AutoSize = true;\r
+            this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label1.Location = new System.Drawing.Point(418, 170);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(43, 13);\r
+            this.label1.TabIndex = 6;\r
+            this.label1.Text = "(Beta)";\r
+            // \r
+            // label4\r
+            // \r
+            this.label4.AutoSize = true;\r
+            this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label4.Location = new System.Drawing.Point(418, 197);\r
+            this.label4.Name = "label4";\r
+            this.label4.Size = new System.Drawing.Size(43, 13);\r
+            this.label4.TabIndex = 7;\r
+            this.label4.Text = "(Beta)";\r
+            // \r
+            // frmSplashScreen\r
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(292, 266);\r
+            this.BackColor = System.Drawing.Color.White;\r
+            this.BackgroundImage = global::Handbrake.Properties.Resources.splash;\r
+            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;\r
+            this.ClientSize = new System.Drawing.Size(496, 276);\r
+            this.ControlBox = false;\r
+            this.Controls.Add(this.label4);\r
+            this.Controls.Add(this.label1);\r
+            this.Controls.Add(this.label3);\r
+            this.Controls.Add(this.label2);\r
+            this.Controls.Add(this.guiVerison);\r
+            this.Controls.Add(this.cliVersion);\r
+            this.Controls.Add(this.productName);\r
+            this.Font = new System.Drawing.Font("Corbel", 8.25F);\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
-            this.Name = "SplashScreen";\r
+            this.Name = "frmSplashScreen";\r
             this.Text = "SplashScreen";\r
             this.ResumeLayout(false);\r
+            this.PerformLayout();\r
 \r
         }\r
 \r
         #endregion\r
+\r
+        private System.Windows.Forms.Label productName;\r
+        private System.Windows.Forms.Label cliVersion;\r
+        private System.Windows.Forms.Label guiVerison;\r
+        private System.Windows.Forms.Label label2;\r
+        private System.Windows.Forms.Label label3;\r
+        private System.Windows.Forms.Label label1;\r
+        private System.Windows.Forms.Label label4;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmSplashScreen.cs b/win/C#/frmSplashScreen.cs
index b0e6812..65ca835 100644 (file)
--- a/win/C#/frmSplashScreen.cs
+++ b/win/C#/frmSplashScreen.cs
@@ -5,6 +5,7 @@ using System.Data;
 using System.Drawing;\r
 using System.Text;\r
 using System.Windows.Forms;\r
+using System.Threading;\r
 \r
 namespace Handbrake\r
 {\r
@@ -14,5 +15,7 @@ namespace Handbrake
         {\r
             InitializeComponent();\r
         }\r
+\r
+           \r
     }\r
 }
\ No newline at end of file