--- /dev/null
+diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
+index eb73032..b71122f 100644
+--- a/win/C#/frmActivityWindow.Designer.cs
++++ b/win/C#/frmActivityWindow.Designer.cs
+@@ -1,16 +1,8 @@
+ /* frmDvdInfo.Designer.cs \r
+ \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
+-/*\r
+- * This file come from HandBrake source code by http://handbrake.fr/ , \r
+- * and modified by hylom <hylomm@gmail.com> for HandBrake Japanese version.\r
+- * It may be used under the terms of the GNU General Public License.\r
+- * last modified date: $Format:%cd$\r
+- */\r
+-\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
+@@ -46,24 +38,15 @@ namespace Handbrake
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmActivityWindow));\r
+ this.rtf_actLog = new System.Windows.Forms.RichTextBox();\r
+ this.rightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components);\r
+-/*\r
+- this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+-*/\r
+ this.mnu_copy_log = new System.Windows.Forms.ToolStripMenuItem();\r
+ this.mnu_openLogFolder = new System.Windows.Forms.ToolStripMenuItem();\r
+ this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();\r
+- this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();\r
+- this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem();\r
+- this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem();\r
+ this.btn_copy = new System.Windows.Forms.ToolStripButton();\r
++ this.logSelector = new System.Windows.Forms.ToolStripComboBox();\r
+ this.panel1 = new System.Windows.Forms.Panel();\r
+- this.statusStrip1 = new System.Windows.Forms.StatusStrip();\r
+- this.lbl_slb = new System.Windows.Forms.ToolStripStatusLabel();\r
+- this.txt_log = new System.Windows.Forms.ToolStripStatusLabel();\r
+ this.rightClickMenu.SuspendLayout();\r
+ this.toolStrip1.SuspendLayout();\r
+- this.statusStrip1.SuspendLayout();\r
+ this.SuspendLayout();\r
+ // \r
+ // rtf_actLog\r
+@@ -75,26 +58,13 @@ namespace Handbrake
+ this.rtf_actLog.Location = new System.Drawing.Point(0, 25);\r
+ this.rtf_actLog.Name = "rtf_actLog";\r
+ this.rtf_actLog.ReadOnly = true;\r
+- this.rtf_actLog.Size = new System.Drawing.Size(404, 530);\r
++ this.rtf_actLog.Size = new System.Drawing.Size(404, 552);\r
+ this.rtf_actLog.TabIndex = 29;\r
+ this.rtf_actLog.Text = "";\r
+ // \r
+ // rightClickMenu\r
+ // \r
+ this.rightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+-/*\r
+- this.copyToolStripMenuItem});\r
+- this.rightClickMenu.Name = "rightClickMenu";\r
+- this.rightClickMenu.Size = new System.Drawing.Size(106, 26);\r
+- // \r
+- // copyToolStripMenuItem\r
+- // \r
+- this.copyToolStripMenuItem.Image = global::Handbrake.Properties.Resources.copy;\r
+- this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";\r
+- this.copyToolStripMenuItem.Size = new System.Drawing.Size(105, 22);\r
+- this.copyToolStripMenuItem.Text = "Copy";\r
+- this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);\r
+-*/\r
+ this.mnu_copy_log,\r
+ this.mnu_openLogFolder});\r
+ this.rightClickMenu.Name = "rightClickMenu";\r
+@@ -106,7 +76,7 @@ namespace Handbrake
+ this.mnu_copy_log.Name = "mnu_copy_log";\r
+ this.mnu_copy_log.Size = new System.Drawing.Size(253, 22);\r
+ this.mnu_copy_log.Text = "Copy";\r
+- this.mnu_copy_log.Click += new System.EventHandler(this.mnu_copy_log_Click);\r
++ this.mnu_copy_log.Click += new System.EventHandler(this.MnuCopyLogClick);\r
+ // \r
+ // mnu_openLogFolder\r
+ // \r
+@@ -114,7 +84,7 @@ namespace Handbrake
+ this.mnu_openLogFolder.Name = "mnu_openLogFolder";\r
+ this.mnu_openLogFolder.Size = new System.Drawing.Size(253, 22);\r
+ this.mnu_openLogFolder.Text = "Open Individual Log File Directory";\r
+- this.mnu_openLogFolder.Click += new System.EventHandler(this.mnu_openLogFolder_Click);\r
++ this.mnu_openLogFolder.Click += new System.EventHandler(this.MnuOpenLogFolderClick);\r
+ // \r
+ // ToolTip\r
+ // \r
+@@ -124,8 +94,8 @@ namespace Handbrake
+ // \r
+ this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;\r
+ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+- this.toolStripDropDownButton1,\r
+- this.btn_copy});\r
++ this.btn_copy,\r
++ this.logSelector});\r
+ this.toolStrip1.Location = new System.Drawing.Point(0, 0);\r
+ this.toolStrip1.Name = "toolStrip1";\r
+ this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;\r
+@@ -133,44 +103,26 @@ namespace Handbrake
+ this.toolStrip1.TabIndex = 96;\r
+ this.toolStrip1.Text = "toolStrip1";\r
+ // \r
+- // toolStripDropDownButton1\r
+- // \r
+- this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;\r
+- this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+- this.btn_encode_log,\r
+- this.btn_scan_log});\r
+- this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Output_Small;\r
+- this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+- this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+- this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";\r
+- this.toolStripDropDownButton1.Size = new System.Drawing.Size(90, 22);\r
+- this.toolStripDropDownButton1.Text = "\83\8d\83O\82ð\91I\91ð";\r
+- // \r
+- // btn_encode_log\r
+- // \r
+- this.btn_encode_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
+- this.btn_encode_log.Name = "btn_encode_log";\r
+- this.btn_encode_log.Size = new System.Drawing.Size(152, 22);\r
+- this.btn_encode_log.Text = "\83G\83\93\83R\81[\83h\83\8d\83O";\r
+- this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click);\r
+- // \r
+- // btn_scan_log\r
+- // \r
+- this.btn_scan_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
+- this.btn_scan_log.Name = "btn_scan_log";\r
+- this.btn_scan_log.Size = new System.Drawing.Size(152, 22);\r
+- this.btn_scan_log.Text = "\83X\83L\83\83\83\93\83\8d\83O";\r
+- this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click);\r
+- // \r
+ // btn_copy\r
+ // \r
+ this.btn_copy.Image = ((System.Drawing.Image)(resources.GetObject("btn_copy.Image")));\r
+ this.btn_copy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
+ this.btn_copy.ImageTransparentColor = System.Drawing.Color.Magenta;\r
+ this.btn_copy.Name = "btn_copy";\r
+- this.btn_copy.Size = new System.Drawing.Size(160, 22);\r
+- this.btn_copy.Text = "\83N\83\8a\83b\83v\83{\81[\83h\82É\83R\83s\81[";\r
+- this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click);\r
++ this.btn_copy.Size = new System.Drawing.Size(122, 22);\r
++ this.btn_copy.Text = "Copy to clipboard";\r
++ this.btn_copy.Click += new System.EventHandler(this.BtnCopyClick);\r
++ // \r
++ // logSelector\r
++ // \r
++ this.logSelector.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;\r
++ this.logSelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
++ this.logSelector.Items.AddRange(new object[] {\r
++ "Scan Log",\r
++ "Encode Log"});\r
++ this.logSelector.Name = "logSelector";\r
++ this.logSelector.Size = new System.Drawing.Size(121, 25);\r
++ this.logSelector.SelectedIndexChanged += new System.EventHandler(this.LogSelectorClick);\r
+ // \r
+ // panel1\r
+ // \r
+@@ -180,33 +132,6 @@ namespace Handbrake
+ this.panel1.Size = new System.Drawing.Size(404, 552);\r
+ this.panel1.TabIndex = 97;\r
+ // \r
+- // statusStrip1\r
+- // \r
+- this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+- this.lbl_slb,\r
+- this.txt_log});\r
+- this.statusStrip1.Location = new System.Drawing.Point(0, 554);\r
+- this.statusStrip1.Name = "statusStrip1";\r
+- this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);\r
+- this.statusStrip1.Size = new System.Drawing.Size(404, 22);\r
+- this.statusStrip1.TabIndex = 98;\r
+- this.statusStrip1.Text = "statusStrip1";\r
+- // \r
+- // lbl_slb\r
+- // \r
+- this.lbl_slb.BackColor = System.Drawing.Color.Transparent;\r
+- this.lbl_slb.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+- this.lbl_slb.Name = "lbl_slb";\r
+- this.lbl_slb.Size = new System.Drawing.Size(85, 17);\r
+- this.lbl_slb.Text = "\91I\91ð\92\86\82Ì\83\8d\83O\81F";\r
+- // \r
+- // txt_log\r
+- // \r
+- this.txt_log.BackColor = System.Drawing.Color.Transparent;\r
+- this.txt_log.Name = "txt_log";\r
+- this.txt_log.Size = new System.Drawing.Size(78, 17);\r
+- this.txt_log.Text = "{selected log}";\r
+- // \r
+ // frmActivityWindow\r
+ // \r
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+@@ -214,7 +139,6 @@ namespace Handbrake
+ this.BackColor = System.Drawing.SystemColors.ControlLight;\r
+ this.ClientSize = new System.Drawing.Size(404, 577);\r
+ this.Controls.Add(this.rtf_actLog);\r
+- this.Controls.Add(this.statusStrip1);\r
+ this.Controls.Add(this.panel1);\r
+ this.Controls.Add(this.toolStrip1);\r
+ this.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+@@ -224,12 +148,11 @@ namespace Handbrake
+ this.Name = "frmActivityWindow";\r
+ this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;\r
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
+- this.Text = "\97\9a\97ð\83E\83B\83\93\83h\83E";\r
++ this.Text = "Activity Window";\r
++ this.Load += new System.EventHandler(this.ActivityWindowLoad);\r
+ this.rightClickMenu.ResumeLayout(false);\r
+ this.toolStrip1.ResumeLayout(false);\r
+ this.toolStrip1.PerformLayout();\r
+- this.statusStrip1.ResumeLayout(false);\r
+- this.statusStrip1.PerformLayout();\r
+ this.ResumeLayout(false);\r
+ this.PerformLayout();\r
+ \r
+@@ -241,15 +164,10 @@ namespace Handbrake
+ internal System.Windows.Forms.ToolTip ToolTip;\r
+ private System.Windows.Forms.ToolStrip toolStrip1;\r
+ private System.Windows.Forms.Panel panel1;\r
+- private System.Windows.Forms.StatusStrip statusStrip1;\r
+- private System.Windows.Forms.ToolStripStatusLabel txt_log;\r
+- private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;\r
+- private System.Windows.Forms.ToolStripMenuItem btn_encode_log;\r
+- private System.Windows.Forms.ToolStripMenuItem btn_scan_log;\r
+ private System.Windows.Forms.ToolStripButton btn_copy;\r
+- private System.Windows.Forms.ToolStripStatusLabel lbl_slb;\r
+ private System.Windows.Forms.ContextMenuStrip rightClickMenu;\r
+ private System.Windows.Forms.ToolStripMenuItem mnu_copy_log;\r
+ private System.Windows.Forms.ToolStripMenuItem mnu_openLogFolder;\r
++ private System.Windows.Forms.ToolStripComboBox logSelector;\r
+ }\r
+ }
+\ No newline at end of file
OSDN Git Service
