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

5 files changed, 211 insertions, 43 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
diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index f4f6b0442..7587d6ca2 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -22,6 +22,7 @@ namespace Handbrake
 {

     public partial class frmActivityWindow : Form

     {

+        delegate void SetTextCallback(string text);

         String read_file;

         Thread monitor;

         frmMain mainWindow;

@@ -31,7 +32,6 @@ namespace Handbrake
         /// <summary>

         /// This window should be used to display the RAW output of the handbrake CLI which is produced during an encode.

         /// </summary>

-        /// 

         public frmActivityWindow(string file, frmMain fm, frmQueue fq)

         {

             InitializeComponent();

@@ -42,11 +42,32 @@ namespace Handbrake
             read_file = file;

             position = 0;

 

+            // Print the Log header in the Rich text box.

+            displayLogHeader();

+

+            // Start a new thread which will montior and keep the log window up to date if required/

+            startLogThread(read_file);

+

+            if (file == "dvdinfo.dat")

+                txt_log.Text = "Selected Log: Scan Log";

+            else if (file == "hb_encode_log.dat")

+                txt_log.Text = "Selected Log: Encode Log";

+

+

+            // When the window closes, we want to abort the monitor thread.

+            this.Disposed += new EventHandler(forceQuit);

+        }

+

+        /// <summary>

+        /// Displays the Log header

+        /// </summary>

+        private void displayLogHeader()

+        {

             // System Information

             Functions.SystemInfo info = new Functions.SystemInfo();

 

             // Add a header to the log file indicating that it's from the Windows GUI and display the windows version

-            rtf_actLog.AppendText("### Windows GUI \n");

+            rtf_actLog.AppendText(String.Format("### Windows GUI {1} {0} \n", Properties.Settings.Default.hb_build, Properties.Settings.Default.hb_version));

             rtf_actLog.AppendText(String.Format("### Running: {0} \n###\n", Environment.OSVersion.ToString()));

             rtf_actLog.AppendText(String.Format("### CPU: {0} \n", info.getCpuCount()));

             rtf_actLog.AppendText(String.Format("### Ram: {0} MB \n", info.TotalPhysicalMemory()));

@@ -55,8 +76,15 @@ namespace Handbrake
             rtf_actLog.AppendText(String.Format("### Install Dir: {0} \n", Application.StartupPath));

             rtf_actLog.AppendText(String.Format("### Data Dir: {0} \n", Application.UserAppDataPath));

             rtf_actLog.AppendText("#########################################\n\n");

+        }

 

-            string logFile = Path.Combine(Path.GetTempPath(), read_file);

+        /// <summary>

+        /// Starts a new thread which runs the autoUpdate function.

+        /// </summary>

+        /// <param name="file"> File which will be used to populate the Rich text box.</param>

+        private void startLogThread(string file)

+        {

+            string logFile = Path.Combine(Path.GetTempPath(), file);

             if (File.Exists(logFile))

             {

                 // Start a new thread to run the autoUpdate process

@@ -66,20 +94,48 @@ namespace Handbrake
             }

             else

                 rtf_actLog.AppendText("\n\n\nERROR: The log file could not be found. \nMaybe you cleared your system's tempory folder or maybe you just havn't run an encode yet. \nTried to find the log file in: " + logFile);

-        

-            // When the window closes, we want to abort the monitor thread.

-            this.Disposed += new EventHandler(forceQuit);

         }

 

-        private void forceQuit(object sender, EventArgs e)

+        /// <summary>

+        /// Change the log file to be displayed to hb_encode_log.dat

+        /// </summary>

+        /// <param name="sender"></param>

+        /// <param name="e"></param>

+        private void btn_scan_log_Click(object sender, EventArgs e)

         {

             if (monitor != null)

                 monitor.Abort();

 

-            this.Close();

+            rtf_actLog.Clear();

+            read_file = "dvdinfo.dat";

+            displayLogHeader();

+            startLogThread(read_file);

+            txt_log.Text = "Selected Log: Scan Log";

+        }

+

+        /// <summary>

+        /// Change the log file to be displayed to dvdinfo.dat

+        /// </summary>

+        /// <param name="sender"></param>

+        /// <param name="e"></param>

+        private void btn_encode_log_Click(object sender, EventArgs e)

+        {

+            if (monitor != null)

+                monitor.Abort();

+

+            rtf_actLog.Clear();

+            read_file = "hb_encode_log.dat";

+            position = 0;

+            displayLogHeader();

+            startLogThread(read_file);

+            txt_log.Text = "Selected Log: Encode Log";

         }

 

-        // Update the Activity window every 5 seconds with the latest log data.

+        /// <summary>

+        /// Updates the log window with any new data which is in the log file.

+        /// This is done every 5 seconds.

+        /// </summary>

+        /// <param name="state"></param>

         private void autoUpdate(object state)

         {

             Boolean lastUpdate = false;

@@ -101,6 +157,9 @@ namespace Handbrake
             }

         }

 

+        /// <summary>

+        /// Finds any new text in the log file and calls a funciton to display this new text.

+        /// </summary>

         private void updateTextFromThread()

         {

             string text = "";

@@ -111,13 +170,17 @@ namespace Handbrake
             {

                 text = data[position].ToString();

                 if (data[position].ToString().Contains("has exited"))

-                    text = "\n ############ End of Encode ############## \n";

+                    text = "\n ############ End of Log ############## \n";

                 position++;

 

                 SetText(text);

             }

         }

-        delegate void SetTextCallback(string text);

+

+        /// <summary>

+        /// Updates the rich text box with anything in the string text.

+        /// </summary>

+        /// <param name="text"></param>

         private void SetText(string text)

         {

             // InvokeRequired required compares the thread ID of the

@@ -134,6 +197,10 @@ namespace Handbrake
             }

         }

 

+        /// <summary>

+        /// Read the log file, and store the data in a List.

+        /// </summary>

+        /// <returns></returns>

         private List<string> readFile()

         {

             // Ok, the task here is to, Get an arraylist of log data.

@@ -176,5 +243,21 @@ namespace Handbrake
             return null;

         }

 

+        /// <summary>

+        /// Kills the montior thead when the window is disposed of.

+        /// </summary>

+        /// <param name="sender"></param>

+        /// <param name="e"></param>

+        private void forceQuit(object sender, EventArgs e)

+        {

+            if (monitor != null)

+                monitor.Abort();

+

+            this.Close();

+        }

+

+

+

+

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmActivityWindow.resx b/win/C#/frmActivityWindow.resx
index d3c0015a0..627b5a9e2 100644
--- a/win/C#/frmActivityWindow.resx
+++ b/win/C#/frmActivityWindow.resx
@@ -120,7 +120,28 @@
   <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>17, 17</value>

   </metadata>

+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>105, 17</value>

+  </metadata>

   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

+  <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+    <value>

+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgxJREFUOE+lkvtL

+        U2EYx+0PEbtpFwnBKPGKiJImGP0gYhIYs1E5GF5gIxkpA00JRSmMEF0ohMh+GaRWYlqabMVcNdS2QpaI

+        VqiDIYhk397vA6fXhCjyhYdzeM/5fp7vczkAdeL2cwho7v/wWzT1zcN+Pwhr51uY2/y41PQaF+wzKKiZ

+        QvaN58g0jyLd5KEUcQbg+84P/Cm2tncQjW3j68YWIqubCC3FcOJc478BAuGoZM6zvoRnakXEruEIjhc4

+        /g5gZop9c+voGAyLbQIfeBZxLL9BA1jzXvuGbWamuKh+GmmVbswE19A59FEBbmoAG7YbsLtm2mZmiml9

+        cvabNDwpz6YB7LYBoMXCumkJr7LOmnnHzBQ/9X2Bo2cOibm1GsBREbAQiYmw/8lnuCeWkVzcgnZlnw1j

+        3HV/wuNXK6i/9x5Hc6wawDlTXHbLJ+LZUBQPRyKwdQdxutwl1h+NLXHh5Ht1ewBHsiwawCW57HyDAfWR

+        dvl0uhZQ1eqX8aVc7EKLqrum651ATLf9OJx5XQM4KmY0xPzZ0hFAiQJnXB0WwME0E3IsL5B17ZlADqWb

+        NYDrOepdlcysmTWWOrxqbceRWtaLk0VO1XW72D5Vckd2gMBfq8zdpmUG62NJvKM4+XyziDk24xmfWoGE

+        s1c0gHPmbrPTpHNJKOCo2G1mZs20zcwUJ5yp1AB5+8/zEwgF5GMVDxh4AAAAAElFTkSuQmCC

+</value>

+  </data>

+  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+    <value>204, 17</value>

+  </metadata>

   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 255469be6..0b42d5d55 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -98,7 +98,6 @@ namespace Handbrake
             this.ToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_encode = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_encodeLog = new System.Windows.Forms.ToolStripMenuItem();

-            this.mnu_viewDVDdata = new System.Windows.Forms.ToolStripMenuItem();

             this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();

             this.mnu_options = new System.Windows.Forms.ToolStripMenuItem();

             this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

@@ -1067,7 +1066,6 @@ namespace Handbrake
             this.ToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

             this.mnu_encode,

             this.mnu_encodeLog,

-            this.mnu_viewDVDdata,

             this.ToolStripSeparator5,

             this.mnu_options});

             this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem";

@@ -1079,7 +1077,7 @@ namespace Handbrake
             this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;

             this.mnu_encode.Name = "mnu_encode";

             this.mnu_encode.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q)));

-            this.mnu_encode.Size = new System.Drawing.Size(251, 22);

+            this.mnu_encode.Size = new System.Drawing.Size(203, 22);

             this.mnu_encode.Text = "Show Queue";

             this.mnu_encode.Click += new System.EventHandler(this.mnu_encode_Click);

             // 

@@ -1087,28 +1085,20 @@ namespace Handbrake
             // 

             this.mnu_encodeLog.Image = global::Handbrake.Properties.Resources.ActivityWindow_small;

             this.mnu_encodeLog.Name = "mnu_encodeLog";

-            this.mnu_encodeLog.Size = new System.Drawing.Size(251, 22);

-            this.mnu_encodeLog.Text = "Activity Window (Encode log)";

+            this.mnu_encodeLog.Size = new System.Drawing.Size(203, 22);

+            this.mnu_encodeLog.Text = "Activity Window";

             this.mnu_encodeLog.Click += new System.EventHandler(this.mnu_encodeLog_Click);

             // 

-            // mnu_viewDVDdata

-            // 

-            this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Movies_Small;

-            this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";

-            this.mnu_viewDVDdata.Size = new System.Drawing.Size(251, 22);

-            this.mnu_viewDVDdata.Text = "Activity Window (Scan log)";

-            this.mnu_viewDVDdata.Click += new System.EventHandler(this.mnu_viewDVDdata_Click);

-            // 

             // ToolStripSeparator5

             // 

             this.ToolStripSeparator5.Name = "ToolStripSeparator5";

-            this.ToolStripSeparator5.Size = new System.Drawing.Size(248, 6);

+            this.ToolStripSeparator5.Size = new System.Drawing.Size(200, 6);

             // 

             // mnu_options

             // 

             this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;

             this.mnu_options.Name = "mnu_options";

-            this.mnu_options.Size = new System.Drawing.Size(251, 22);

+            this.mnu_options.Size = new System.Drawing.Size(203, 22);

             this.mnu_options.Text = "Options";

             this.mnu_options.Click += new System.EventHandler(this.mnu_options_Click);

             // 

@@ -1939,6 +1929,7 @@ namespace Handbrake
             // 

             // text_bottom

             // 

+            this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

             this.text_bottom.Location = new System.Drawing.Point(96, 130);

             this.text_bottom.Maximum = new decimal(new int[] {

             1080,

@@ -1951,6 +1942,7 @@ namespace Handbrake
             // 

             // text_top

             // 

+            this.text_top.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

             this.text_top.Location = new System.Drawing.Point(96, 84);

             this.text_top.Maximum = new decimal(new int[] {

             1080,

@@ -1963,6 +1955,7 @@ namespace Handbrake
             // 

             // text_left

             // 

+            this.text_left.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

             this.text_left.Location = new System.Drawing.Point(45, 106);

             this.text_left.Maximum = new decimal(new int[] {

             1920,

@@ -1975,6 +1968,7 @@ namespace Handbrake
             // 

             // text_right

             // 

+            this.text_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

             this.text_right.Location = new System.Drawing.Point(147, 106);

             this.text_right.Maximum = new decimal(new int[] {

             1920,

@@ -3149,7 +3143,7 @@ namespace Handbrake
             // 

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

             this.lbl_encode});

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

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

             this.StatusStrip.Name = "StatusStrip";

             this.StatusStrip.Size = new System.Drawing.Size(938, 22);

             this.StatusStrip.TabIndex = 7;

@@ -3166,7 +3160,7 @@ namespace Handbrake
             // 

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

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

-            this.ClientSize = new System.Drawing.Size(938, 641);

+            this.ClientSize = new System.Drawing.Size(938, 639);

             this.Controls.Add(this.GroupBox1);

             this.Controls.Add(this.groupBox_dest);

             this.Controls.Add(this.groupBox_output);

@@ -3232,7 +3226,6 @@ namespace Handbrake
         internal System.Windows.Forms.ToolStripMenuItem mnu_exit;

         internal System.Windows.Forms.ToolStripMenuItem ToolsToolStripMenuItem;

         internal System.Windows.Forms.ToolStripMenuItem mnu_encode;

-        internal System.Windows.Forms.ToolStripMenuItem mnu_viewDVDdata;

         internal System.Windows.Forms.ToolStripSeparator ToolStripSeparator5;

         internal System.Windows.Forms.ToolStripMenuItem mnu_options;

         internal System.Windows.Forms.ToolStripMenuItem PresetsToolStripMenuItem;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 69c2056f5..7cd0784f3 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -236,11 +236,6 @@ namespace Handbrake
             frmActivityWindow dvdInfoWindow = new frmActivityWindow("hb_encode_log.dat", this, queueWindow);

             dvdInfoWindow.Show();

         }

-        private void mnu_viewDVDdata_Click(object sender, EventArgs e)

-        {

-            frmActivityWindow dvdInfoWindow = new frmActivityWindow("dvdinfo.dat", this, queueWindow);

-            dvdInfoWindow.Show();

-        }

         private void mnu_options_Click(object sender, EventArgs e)

         {

             Form Options = new frmOptions(this);