WinGui:

- Some changes that didn't get picked up from the last checkin.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 90ea838..405d1ba 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -385,6 +385,7 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="handbrakepineapple.ico" />\r
+    <None Include="Properties\AssemblyInfo.cs.tmpl" />\r
     <None Include="Resources\logo64.png" />\r
     <None Include="Resources\logo128.png" />\r
     <None Include="Resources\ActivityWindow.png" />\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 3223220..7a66da4 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -527,7 +527,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("3264")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("3378")]\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 e6f6778..5444f20 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)">3264</Value>\r
+      <Value Profile="(Default)">3378</Value>\r
     </Setting>\r
     <Setting Name="UpdateRequired" Type="System.Boolean" Scope="User">\r
       <Value Profile="(Default)">True</Value>\r

diff --git a/win/C#/app.config b/win/C#/app.config
index b2fa2f2..377f3bb 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>3264</value>\r
+        <value>3378</value>\r
       </setting>\r
       <setting name="UpdateRequired" serializeAs="String">\r
         <value>True</value>\r

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index 2c2fc3f..aab6dea 100644 (file)
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -42,6 +42,7 @@ namespace Handbrake
             this.btn_close = new System.Windows.Forms.Button();\r
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();\r
             this.label2 = new System.Windows.Forms.Label();\r
+            this.lbl_GUIBuild = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -60,23 +61,23 @@ namespace Handbrake
             // label1\r
             // \r
             this.label1.AutoSize = true;\r
-            this.label1.Location = new System.Drawing.Point(125, 63);\r
+            this.label1.Location = new System.Drawing.Point(125, 64);\r
             this.label1.Margin = new System.Windows.Forms.Padding(3);\r
             this.label1.Name = "label1";\r
             this.label1.Size = new System.Drawing.Size(224, 13);\r
             this.label1.TabIndex = 33;\r
-            this.label1.Text = "Copyright  2003-2009 HandBrake Developers";\r
+            this.label1.Text = "Copyright  2003-2010 HandBrake Developers";\r
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
             // \r
             // lbl_HBBuild\r
             // \r
             this.lbl_HBBuild.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_HBBuild.Location = new System.Drawing.Point(125, 33);\r
+            this.lbl_HBBuild.Location = new System.Drawing.Point(125, 35);\r
             this.lbl_HBBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3);\r
             this.lbl_HBBuild.Name = "lbl_HBBuild";\r
             this.lbl_HBBuild.Size = new System.Drawing.Size(224, 13);\r
             this.lbl_HBBuild.TabIndex = 32;\r
-            this.lbl_HBBuild.Text = "{Version}";\r
+            this.lbl_HBBuild.Text = "{CLI Version}";\r
             this.lbl_HBBuild.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
             // \r
             // PictureBox1\r
@@ -95,7 +96,7 @@ namespace Handbrake
             // btn_close\r
             // \r
             this.btn_close.DialogResult = System.Windows.Forms.DialogResult.OK;\r
-            this.btn_close.Location = new System.Drawing.Point(468, 279);\r
+            this.btn_close.Location = new System.Drawing.Point(468, 270);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(75, 23);\r
             this.btn_close.TabIndex = 35;\r
@@ -105,7 +106,7 @@ namespace Handbrake
             // \r
             // richTextBox1\r
             // \r
-            this.richTextBox1.Location = new System.Drawing.Point(128, 111);\r
+            this.richTextBox1.Location = new System.Drawing.Point(128, 102);\r
             this.richTextBox1.Name = "richTextBox1";\r
             this.richTextBox1.Size = new System.Drawing.Size(415, 162);\r
             this.richTextBox1.TabIndex = 36;\r
@@ -114,7 +115,7 @@ namespace Handbrake
             // label2\r
             // \r
             this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(125, 92);\r
+            this.label2.Location = new System.Drawing.Point(125, 83);\r
             this.label2.Margin = new System.Windows.Forms.Padding(3);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(46, 13);\r
@@ -122,13 +123,25 @@ namespace Handbrake
             this.label2.Text = "License:";\r
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
             // \r
+            // lbl_GUIBuild\r
+            // \r
+            this.lbl_GUIBuild.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_GUIBuild.Location = new System.Drawing.Point(229, 17);\r
+            this.lbl_GUIBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3);\r
+            this.lbl_GUIBuild.Name = "lbl_GUIBuild";\r
+            this.lbl_GUIBuild.Size = new System.Drawing.Size(224, 13);\r
+            this.lbl_GUIBuild.TabIndex = 38;\r
+            this.lbl_GUIBuild.Text = "{GUI Version}";\r
+            this.lbl_GUIBuild.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
+            // \r
             // frmAbout\r
             // \r
             this.AcceptButton = this.btn_close;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;\r
             this.CancelButton = this.btn_close;\r
-            this.ClientSize = new System.Drawing.Size(555, 314);\r
+            this.ClientSize = new System.Drawing.Size(555, 302);\r
+            this.Controls.Add(this.lbl_GUIBuild);\r
             this.Controls.Add(this.label2);\r
             this.Controls.Add(this.richTextBox1);\r
             this.Controls.Add(this.btn_close);\r
@@ -161,5 +174,6 @@ namespace Handbrake
         private System.Windows.Forms.Button btn_close;\r
         private System.Windows.Forms.RichTextBox richTextBox1;\r
         internal System.Windows.Forms.Label label2;\r
+        internal System.Windows.Forms.Label lbl_GUIBuild;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmAbout.cs b/win/C#/frmAbout.cs
index 6531cf1..9db62f8 100644 (file)
--- a/win/C#/frmAbout.cs
+++ b/win/C#/frmAbout.cs
@@ -1,11 +1,12 @@
 /*  frmAbout.cs $\r
-   This file is part of the HandBrake source code.\r
+    This file is part of the HandBrake source code.\r
     Homepage: <http://handbrake.fr>.\r
     It may be used under the terms of the GNU General Public License. */\r
 \r
 namespace Handbrake\r
 {\r
     using System;\r
+    using System.Reflection;\r
     using System.Windows.Forms;\r
 \r
     /// <summary>\r
@@ -19,8 +20,12 @@ namespace Handbrake
         public frmAbout()\r
         {\r
             InitializeComponent();\r
-            lbl_HBBuild.Text = Properties.Settings.Default.hb_version + " (" + Properties.Settings.Default.hb_build +\r
+            lbl_HBBuild.Text = "CLI Build: " + Properties.Settings.Default.hb_version + " (" + Properties.Settings.Default.hb_build +\r
                                ") - " + Properties.Settings.Default.hb_platform;\r
+\r
+            Version gui = Assembly.GetExecutingAssembly().GetName().Version;\r
+            Version appServices = HandBrake.ApplicationServices.Init.AssemblyVersion();\r
+            lbl_GUIBuild.Text = gui.ToString(4) + " (Services: "  + appServices.ToString(4) + ")";\r
         }\r
 \r
         /// <summary>\r