add UI version label to frmAbout

diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index 3e49a27..4d9561f 100644 (file)
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -17,7 +17,7 @@
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "Handbrake\93ú\96{\8cê\94Å"\r
 !define PRODUCT_VERSION "0.9.4"\r
-!define PRODUCT_VERSION_NUMBER "0.9.4jp"\r
+!define PRODUCT_VERSION_NUMBER "0.9.4jp-r2"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index db1c86c..b8ef0e6 100644 (file)
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -47,6 +47,8 @@ namespace Handbrake
             this.lbl_HBBuild = new System.Windows.Forms.Label();\r
             this.PictureBox1 = new System.Windows.Forms.PictureBox();\r
             this.btn_close = new System.Windows.Forms.Button();\r
+            this.lbl_UIVer = new System.Windows.Forms.Label();\r
+            this.label2 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
@@ -57,15 +59,15 @@ namespace Handbrake
             this.Label3.Location = new System.Drawing.Point(124, 12);\r
             this.Label3.Margin = new System.Windows.Forms.Padding(3, 3, 3, 1);\r
             this.Label3.Name = "Label3";\r
-            this.Label3.Size = new System.Drawing.Size(99, 19);\r
+            this.Label3.Size = new System.Drawing.Size(167, 19);\r
             this.Label3.TabIndex = 25;\r
-            this.Label3.Text = "HandBrake";\r
+            this.Label3.Text = "HandBrake\93ú\96{\8cê\94Å";\r
             this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
             // \r
             // 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, 82);\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
@@ -100,7 +102,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(274, 82);\r
+            this.btn_close.Location = new System.Drawing.Point(274, 125);\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
@@ -108,13 +110,33 @@ namespace Handbrake
             this.btn_close.UseVisualStyleBackColor = true;\r
             this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
             // \r
+            // lbl_UIVer\r
+            // \r
+            this.lbl_UIVer.Location = new System.Drawing.Point(125, 50);\r
+            this.lbl_UIVer.Name = "lbl_UIVer";\r
+            this.lbl_UIVer.Size = new System.Drawing.Size(224, 13);\r
+            this.lbl_UIVer.TabIndex = 36;\r
+            this.lbl_UIVer.Text = "{UI_Version}";\r
+            this.lbl_UIVer.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
+            // \r
+            // label2\r
+            // \r
+            this.label2.AutoSize = true;\r
+            this.label2.Location = new System.Drawing.Point(125, 99);\r
+            this.label2.Name = "label2";\r
+            this.label2.Size = new System.Drawing.Size(204, 13);\r
+            this.label2.TabIndex = 37;\r
+            this.label2.Text = "localized by hylom@users.sourceforge.jp";\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(363, 117);\r
+            this.ClientSize = new System.Drawing.Size(363, 160);\r
+            this.Controls.Add(this.label2);\r
+            this.Controls.Add(this.lbl_UIVer);\r
             this.Controls.Add(this.btn_close);\r
             this.Controls.Add(this.label1);\r
             this.Controls.Add(this.PictureBox1);\r
@@ -129,7 +151,7 @@ namespace Handbrake
             this.ShowIcon = false;\r
             this.ShowInTaskbar = false;\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
-            this.Text = "HandBrake\82É\82Â\82¢\82Ä";\r
+            this.Text = "HandBrake\93ú\96{\8cê\94Å\82É\82Â\82¢\82Ä";\r
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
@@ -143,5 +165,7 @@ namespace Handbrake
         internal System.Windows.Forms.Label lbl_HBBuild;\r
         internal System.Windows.Forms.PictureBox PictureBox1;\r
         private System.Windows.Forms.Button btn_close;\r
+        private System.Windows.Forms.Label label2;\r
+        internal System.Windows.Forms.Label lbl_UIVer;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmAbout.cs b/win/C#/frmAbout.cs
index 088ca88..4d7574f 100644 (file)
--- a/win/C#/frmAbout.cs
+++ b/win/C#/frmAbout.cs
@@ -23,11 +23,18 @@ namespace Handbrake
         {\r
             InitializeComponent();\r
             lbl_HBBuild.Text = Properties.Settings.Default.hb_version + " (" + Properties.Settings.Default.hb_build + ") - " + Properties.Settings.Default.hb_platform;\r
+            \r
+            // get GUI version\r
+            System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly();\r
+            System.Version ver = asm.GetName().Version;\r
+            lbl_UIVer.Text = "HandBrake UI version: " + ver.ToString(); \r
+\r
         }\r
 \r
         private void btn_close_Click(object sender, EventArgs e)\r
         {\r
             this.Close();\r
         }\r
+\r
     }\r
 }
\ No newline at end of file