WinGui:

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

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

6 files changed, 33 insertions, 13 deletions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 90ea83859..405d1ba2b 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -385,6 +385,7 @@
   </ItemGroup>

   <ItemGroup>

     <Content Include="handbrakepineapple.ico" />

+    <None Include="Properties\AssemblyInfo.cs.tmpl" />

     <None Include="Resources\logo64.png" />

     <None Include="Resources\logo128.png" />

     <None Include="Resources\ActivityWindow.png" />

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 32232208e..7a66da470 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -527,7 +527,7 @@ namespace Handbrake.Properties {
         

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

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

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

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

         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 e6f6778f2..5444f2010 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)">3264</Value>

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

     </Setting>

     <Setting Name="UpdateRequired" Type="System.Boolean" Scope="User">

       <Value Profile="(Default)">True</Value>

diff --git a/win/C#/app.config b/win/C#/app.config
index b2fa2f2ce..377f3bbd6 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>3264</value>

+        <value>3378</value>

       </setting>

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

         <value>True</value>

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index 2c2fc3f73..aab6dea6b 100644
--- 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();

             this.richTextBox1 = new System.Windows.Forms.RichTextBox();

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

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

             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();

             this.SuspendLayout();

             // 

@@ -60,23 +61,23 @@ namespace Handbrake
             // label1

             // 

             this.label1.AutoSize = true;

-            this.label1.Location = new System.Drawing.Point(125, 63);

+            this.label1.Location = new System.Drawing.Point(125, 64);

             this.label1.Margin = new System.Windows.Forms.Padding(3);

             this.label1.Name = "label1";

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

             this.label1.TabIndex = 33;

-            this.label1.Text = "Copyright  2003-2009 HandBrake Developers";

+            this.label1.Text = "Copyright  2003-2010 HandBrake Developers";

             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

             // 

             // lbl_HBBuild

             // 

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

-            this.lbl_HBBuild.Location = new System.Drawing.Point(125, 33);

+            this.lbl_HBBuild.Location = new System.Drawing.Point(125, 35);

             this.lbl_HBBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3);

             this.lbl_HBBuild.Name = "lbl_HBBuild";

             this.lbl_HBBuild.Size = new System.Drawing.Size(224, 13);

             this.lbl_HBBuild.TabIndex = 32;

-            this.lbl_HBBuild.Text = "{Version}";

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

             this.lbl_HBBuild.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

             // 

             // PictureBox1

@@ -95,7 +96,7 @@ namespace Handbrake
             // btn_close

             // 

             this.btn_close.DialogResult = System.Windows.Forms.DialogResult.OK;

-            this.btn_close.Location = new System.Drawing.Point(468, 279);

+            this.btn_close.Location = new System.Drawing.Point(468, 270);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(75, 23);

             this.btn_close.TabIndex = 35;

@@ -105,7 +106,7 @@ namespace Handbrake
             // 

             // richTextBox1

             // 

-            this.richTextBox1.Location = new System.Drawing.Point(128, 111);

+            this.richTextBox1.Location = new System.Drawing.Point(128, 102);

             this.richTextBox1.Name = "richTextBox1";

             this.richTextBox1.Size = new System.Drawing.Size(415, 162);

             this.richTextBox1.TabIndex = 36;

@@ -114,7 +115,7 @@ namespace Handbrake
             // label2

             // 

             this.label2.AutoSize = true;

-            this.label2.Location = new System.Drawing.Point(125, 92);

+            this.label2.Location = new System.Drawing.Point(125, 83);

             this.label2.Margin = new System.Windows.Forms.Padding(3);

             this.label2.Name = "label2";

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

@@ -122,13 +123,25 @@ namespace Handbrake
             this.label2.Text = "License:";

             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

             // 

+            // lbl_GUIBuild

+            // 

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

+            this.lbl_GUIBuild.Location = new System.Drawing.Point(229, 17);

+            this.lbl_GUIBuild.Margin = new System.Windows.Forms.Padding(3, 1, 3, 3);

+            this.lbl_GUIBuild.Name = "lbl_GUIBuild";

+            this.lbl_GUIBuild.Size = new System.Drawing.Size(224, 13);

+            this.lbl_GUIBuild.TabIndex = 38;

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

+            this.lbl_GUIBuild.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

+            // 

             // frmAbout

             // 

             this.AcceptButton = this.btn_close;

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

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

             this.CancelButton = this.btn_close;

-            this.ClientSize = new System.Drawing.Size(555, 314);

+            this.ClientSize = new System.Drawing.Size(555, 302);

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

             this.Controls.Add(this.label2);

             this.Controls.Add(this.richTextBox1);

             this.Controls.Add(this.btn_close);

@@ -161,5 +174,6 @@ namespace Handbrake
         private System.Windows.Forms.Button btn_close;

         private System.Windows.Forms.RichTextBox richTextBox1;

         internal System.Windows.Forms.Label label2;

+        internal System.Windows.Forms.Label lbl_GUIBuild;

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmAbout.cs b/win/C#/frmAbout.cs
index 6531cf13b..9db62f871 100644
--- a/win/C#/frmAbout.cs
+++ b/win/C#/frmAbout.cs
@@ -1,11 +1,12 @@
 /*  frmAbout.cs $

-   This file is part of the HandBrake source code.

+    This file is part of the HandBrake source code.

     Homepage: <http://handbrake.fr>.

     It may be used under the terms of the GNU General Public License. */

 

 namespace Handbrake

 {

     using System;

+    using System.Reflection;

     using System.Windows.Forms;

 

     /// <summary>

@@ -19,8 +20,12 @@ namespace Handbrake
         public frmAbout()

         {

             InitializeComponent();

-            lbl_HBBuild.Text = Properties.Settings.Default.hb_version + " (" + Properties.Settings.Default.hb_build +

+            lbl_HBBuild.Text = "CLI Build: " + Properties.Settings.Default.hb_version + " (" + Properties.Settings.Default.hb_build +

                                ") - " + Properties.Settings.Default.hb_platform;

+

+            Version gui = Assembly.GetExecutingAssembly().GetName().Version;

+            Version appServices = HandBrake.ApplicationServices.Init.AssemblyVersion();

+            lbl_GUIBuild.Text = gui.ToString(4) + " (Services: "  + appServices.ToString(4) + ")";

         }

 

         /// <summary>