WinGui:

- Select which log file to view from the Activity Window rather than the tools menu / task bar.

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

1 files changed, 85 insertions, 9 deletions

diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs
index 865bf3c05..1eb48fc44 100644
--- a/win/C#/frmActivityWindow.Designer.cs
+++ b/win/C#/frmActivityWindow.Designer.cs
@@ -38,8 +38,15 @@ namespace Handbrake
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmActivityWindow));

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

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();

+            this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton();

+            this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem();

+            this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem();

             this.panel1 = new System.Windows.Forms.Panel();

-            this.panel1.SuspendLayout();

+            this.statusStrip1 = new System.Windows.Forms.StatusStrip();

+            this.txt_log = new System.Windows.Forms.ToolStripStatusLabel();

+            this.toolStrip1.SuspendLayout();

+            this.statusStrip1.SuspendLayout();

             this.SuspendLayout();

             // 

             // rtf_actLog

@@ -47,10 +54,10 @@ namespace Handbrake
             this.rtf_actLog.Cursor = System.Windows.Forms.Cursors.IBeam;

             this.rtf_actLog.DetectUrls = false;

             this.rtf_actLog.Dock = System.Windows.Forms.DockStyle.Fill;

-            this.rtf_actLog.Location = new System.Drawing.Point(0, 0);

+            this.rtf_actLog.Location = new System.Drawing.Point(0, 25);

             this.rtf_actLog.Name = "rtf_actLog";

             this.rtf_actLog.ReadOnly = true;

-            this.rtf_actLog.Size = new System.Drawing.Size(441, 512);

+            this.rtf_actLog.Size = new System.Drawing.Size(471, 530);

             this.rtf_actLog.TabIndex = 29;

             this.rtf_actLog.Text = "";

             // 

@@ -58,22 +65,81 @@ namespace Handbrake
             // 

             this.ToolTip.Active = false;

             // 

+            // toolStrip1

+            // 

+            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;

+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.toolStripDropDownButton1});

+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);

+            this.toolStrip1.Name = "toolStrip1";

+            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;

+            this.toolStrip1.Size = new System.Drawing.Size(471, 25);

+            this.toolStrip1.TabIndex = 96;

+            this.toolStrip1.Text = "toolStrip1";

+            // 

+            // toolStripDropDownButton1

+            // 

+            this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;

+            this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.btn_encode_log,

+            this.btn_scan_log});

+            this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image")));

+            this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";

+            this.toolStripDropDownButton1.Size = new System.Drawing.Size(69, 22);

+            this.toolStripDropDownButton1.Text = "Select Log";

+            // 

+            // btn_encode_log

+            // 

+            this.btn_encode_log.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;

+            this.btn_encode_log.Name = "btn_encode_log";

+            this.btn_encode_log.Size = new System.Drawing.Size(152, 22);

+            this.btn_encode_log.Text = "Encode Log";

+            this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click);

+            // 

+            // btn_scan_log

+            // 

+            this.btn_scan_log.Image = global::Handbrake.Properties.Resources.Movies_Small;

+            this.btn_scan_log.Name = "btn_scan_log";

+            this.btn_scan_log.Size = new System.Drawing.Size(152, 22);

+            this.btn_scan_log.Text = "Scan Log";

+            this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click);

+            // 

             // panel1

             // 

-            this.panel1.Controls.Add(this.rtf_actLog);

             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;

-            this.panel1.Location = new System.Drawing.Point(0, 0);

+            this.panel1.Location = new System.Drawing.Point(0, 25);

             this.panel1.Name = "panel1";

-            this.panel1.Size = new System.Drawing.Size(441, 512);

-            this.panel1.TabIndex = 95;

+            this.panel1.Size = new System.Drawing.Size(471, 552);

+            this.panel1.TabIndex = 97;

+            // 

+            // statusStrip1

+            // 

+            this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.txt_log});

+            this.statusStrip1.Location = new System.Drawing.Point(0, 555);

+            this.statusStrip1.Name = "statusStrip1";

+            this.statusStrip1.Size = new System.Drawing.Size(471, 22);

+            this.statusStrip1.TabIndex = 98;

+            this.statusStrip1.Text = "statusStrip1";

+            // 

+            // txt_log

+            // 

+            this.txt_log.BackColor = System.Drawing.Color.Transparent;

+            this.txt_log.Name = "txt_log";

+            this.txt_log.Size = new System.Drawing.Size(74, 17);

+            this.txt_log.Text = "{selected log}";

             // 

             // frmActivityWindow

             // 

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

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

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(441, 512);

+            this.ClientSize = new System.Drawing.Size(471, 577);

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

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

             this.Controls.Add(this.panel1);

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

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

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.MaximizeBox = false;

@@ -82,8 +148,12 @@ namespace Handbrake
             this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

             this.Text = "Activity Window";

-            this.panel1.ResumeLayout(false);

+            this.toolStrip1.ResumeLayout(false);

+            this.toolStrip1.PerformLayout();

+            this.statusStrip1.ResumeLayout(false);

+            this.statusStrip1.PerformLayout();

             this.ResumeLayout(false);

+            this.PerformLayout();

 

         }

 

@@ -91,6 +161,12 @@ namespace Handbrake
 

         internal System.Windows.Forms.RichTextBox rtf_actLog;

         internal System.Windows.Forms.ToolTip ToolTip;

+        private System.Windows.Forms.ToolStrip toolStrip1;

         private System.Windows.Forms.Panel panel1;

+        private System.Windows.Forms.StatusStrip statusStrip1;

+        private System.Windows.Forms.ToolStripStatusLabel txt_log;

+        private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1;

+        private System.Windows.Forms.ToolStripMenuItem btn_encode_log;

+        private System.Windows.Forms.ToolStripMenuItem btn_scan_log;

     }

 }
\ No newline at end of file