WinGui:

misc UI control placement changes
updates to some FormBorderStyle's
converted Parsing code to use regex instead of substrings and string splitting
added a couple of additional code comments

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

14 files changed, 149 insertions, 117 deletions

diff --git a/win/C#/Parsing/AudioTrack.cs b/win/C#/Parsing/AudioTrack.cs
index d23d34748..98114a5ca 100644
--- a/win/C#/Parsing/AudioTrack.cs
+++ b/win/C#/Parsing/AudioTrack.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using System.IO;

+using System.Text.RegularExpressions;

 

 namespace Handbrake.Parsing

 {

@@ -91,25 +92,18 @@ namespace Handbrake.Parsing
             return string.Format("{0} {1} ({2}) ({3})", this.m_trackNumber, this.m_language, this.m_format, this.m_subFormat);

         }

 

-        public static AudioTrack Parse(StreamReader output)

+        public static AudioTrack Parse(StringReader output)

         {

-            string curLine = output.ReadLine();

-            if (!curLine.Contains("  + subtitle tracks:"))

+            Match m = Regex.Match(output.ReadLine(), @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");

+            if (m.Success)

             {

                 AudioTrack thisTrack = new AudioTrack();

-                string[] splitter = curLine.Split(new string[] { "    + ", ", ", " (", ") (", " ch", "), ", "Hz, ", "bps" }, StringSplitOptions.RemoveEmptyEntries);

-                thisTrack.m_trackNumber = int.Parse(splitter[0]);

-                thisTrack.m_language = splitter[1];

-                thisTrack.m_format = splitter[2];

-                /*

-                 * Problem 2

-                 * Field 'Handbrake.frmMain.hbProc' is never assigned to, and will always have it's default value null.

-                 * This happens with "AllAudios.iso" which is a test file. http://www.sr88.co.uk/AllAudios.iso  (~95MB)

-                 */

-

-                thisTrack.m_subFormat = splitter[3];

-                thisTrack.m_frequency = int.Parse(splitter[4]);

-                thisTrack.m_bitrate = int.Parse(splitter[5]);

+                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value);

+                thisTrack.m_language = m.Groups[2].Value;

+                thisTrack.m_format = m.Groups[3].Value;

+                thisTrack.m_subFormat = m.Groups[4].Value;

+                thisTrack.m_frequency = int.Parse(m.Groups[5].Value);

+                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value);

                 return thisTrack;

             }

             else

@@ -118,10 +112,10 @@ namespace Handbrake.Parsing
             }

         }

 

-        public static AudioTrack[] ParseList(StreamReader output)

+        public static AudioTrack[] ParseList(StringReader output)

         {

             List<AudioTrack> tracks = new List<AudioTrack>();

-            while (true) // oh glorious hack, serve me well

+            while (true)

             {

                 AudioTrack thisTrack = AudioTrack.Parse(output);

                 if (thisTrack != null)

diff --git a/win/C#/Parsing/Chapter.cs b/win/C#/Parsing/Chapter.cs
index c824fcd68..665841e97 100644
--- a/win/C#/Parsing/Chapter.cs
+++ b/win/C#/Parsing/Chapter.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using System.IO;

+using System.Text.RegularExpressions;

 

 namespace Handbrake.Parsing

 {

@@ -43,15 +44,14 @@ namespace Handbrake.Parsing
             return this.m_chapterNumber.ToString();

         }

 

-        public static Chapter Parse(StreamReader output)

+        public static Chapter Parse(StringReader output)

         {

-            string curLine = output.ReadLine();

-            if (!curLine.Contains("  + audio tracks:"))

+            Match m = Regex.Match(output.ReadLine(), @"^    \+ ([0-9]*): cells ([0-9]*)->([0-9]*), ([0-9]*) blocks, duration ([0-9]{2}:[0-9]{2}:[0-9]{2})");

+            if (m.Success)

             {

                 Chapter thisChapter = new Chapter();

-                string[] splitter = curLine.Split(new string[] { "    + ", ": cells ", ", ", " blocks, duration ", "->" }, StringSplitOptions.RemoveEmptyEntries);

-                thisChapter.m_chapterNumber = int.Parse(splitter[0]);

-                thisChapter.m_duration = TimeSpan.Parse(splitter[4]);

+                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value);

+                thisChapter.m_duration = TimeSpan.Parse(m.Groups[5].Value);

                 return thisChapter;

             }

             else

@@ -60,14 +60,19 @@ namespace Handbrake.Parsing
             }

         }

 

-        public static Chapter[] ParseList(StreamReader output)

+        public static Chapter[] ParseList(StringReader output)

         {

             List<Chapter> chapters = new List<Chapter>();

-            string curLine = output.ReadLine();

-            while (!curLine.Contains("  + audio tracks:"))

+

+            // this is to read the "  + chapters:" line from the buffer

+            // so we can start reading the chapters themselvs

+            output.ReadLine();

+

+            while (true)

             {

+                // Start of the chapter list for this Title

                 Chapter thisChapter = Chapter.Parse(output);

-           

+

                 if (thisChapter != null)

                 {

                     chapters.Add(thisChapter);

diff --git a/win/C#/Parsing/DVD.cs b/win/C#/Parsing/DVD.cs
index 1c2e0d0e7..025961240 100644
--- a/win/C#/Parsing/DVD.cs
+++ b/win/C#/Parsing/DVD.cs
@@ -2,8 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using System.IO;

-using System.Windows.Forms;

-

+using System.Text.RegularExpressions;

 

 namespace Handbrake.Parsing

 {

@@ -37,11 +36,13 @@ namespace Handbrake.Parsing
             DVD thisDVD = new DVD();

             while (!output.EndOfStream)

             {

-                string curLine = output.ReadLine();

-

-                if (curLine.Contains("Scanning title"))

+                if ((char)output.Peek() == '+')

+                {

+                    thisDVD.m_titles.AddRange(Title.ParseList(output.ReadToEnd()));

+                }

+                else

                 {

-                    thisDVD.m_titles.AddRange(Title.ParseList(output));

+                    output.ReadLine();

                 }

             }

             return thisDVD;

diff --git a/win/C#/Parsing/Parser.cs b/win/C#/Parsing/Parser.cs
index ef6476f78..afd5471d0 100644
--- a/win/C#/Parsing/Parser.cs
+++ b/win/C#/Parsing/Parser.cs
@@ -13,6 +13,12 @@ namespace Handbrake.Parsing
     /// <param name="Data">The data parsed from the stream</param>

     public delegate void DataReadEventHandler(object Sender, string Data);

 

+    /// <summary>

+    /// A delegate to handle events regarding progress during DVD scanning

+    /// </summary>

+    /// <param name="Sender">The object who's raising the event</param>

+    /// <param name="CurrentTitle">The title number currently being processed</param>

+    /// <param name="TitleCount">The total number of titiles to be processed</param>

     public delegate void ScanProgressEventHandler(object Sender, int CurrentTitle, int TitleCount);

 

     /// <summary>

@@ -42,6 +48,9 @@ namespace Handbrake.Parsing
         /// </summary>

         public static event DataReadEventHandler OnReadToEnd;

 

+        /// <summary>

+        /// Raised upon the catching of a "Scanning title # of #..." in the stream

+        /// </summary>

         public static event ScanProgressEventHandler OnScanProgress;

 

         /// <summary>

diff --git a/win/C#/Parsing/Subtitle.cs b/win/C#/Parsing/Subtitle.cs
index 66cc07843..a30fd7882 100644
--- a/win/C#/Parsing/Subtitle.cs
+++ b/win/C#/Parsing/Subtitle.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 using System.IO;

+using System.Text.RegularExpressions;

 

 namespace Handbrake.Parsing

 {

@@ -43,15 +44,15 @@ namespace Handbrake.Parsing
             return string.Format("{0} {1}", this.m_trackNumber, this.m_language);

         }

 

-        public static Subtitle Parse(StreamReader output)

+        public static Subtitle Parse(StringReader output)

         {

             string curLine = output.ReadLine();

-            if (!curLine.Contains("HandBrake has exited."))

+            Match m = Regex.Match(curLine, @"^    \+ ([0-9]*), ([A-Za-z]*) \((.*)\)");

+            if (m.Success && !curLine.Contains("HandBrake has exited."))

             {

                 Subtitle thisSubtitle = new Subtitle();

-                string[] splitter = curLine.Split(new string[] { "    + ", ", " }, StringSplitOptions.RemoveEmptyEntries);

-                thisSubtitle.m_trackNumber = int.Parse(splitter[0]);

-                thisSubtitle.m_language = splitter[1];

+                thisSubtitle.m_trackNumber = int.Parse(m.Groups[1].Value);

+                thisSubtitle.m_language = m.Groups[2].Value;

                 return thisSubtitle;

             }

             else

@@ -60,10 +61,10 @@ namespace Handbrake.Parsing
             }

         }

 

-        public static Subtitle[] ParseList(StreamReader output)

+        public static Subtitle[] ParseList(StringReader output)

         {

             List<Subtitle> subtitles = new List<Subtitle>();

-            while ((char)output.Peek() != '+') // oh glorious hack, serve me well

+            while ((char)output.Peek() != '+')

             {

                 Subtitle thisSubtitle = Subtitle.Parse(output);

 

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index 6f3574f67..933be6d2d 100644
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -4,6 +4,7 @@ using System.Text;
 using System.Drawing;

 using System.IO;

 using System.Windows.Forms;

+using System.Text.RegularExpressions;

 

 namespace Handbrake.Parsing

 {

@@ -96,7 +97,6 @@ namespace Handbrake.Parsing
             }

         }

 

-

         private int[] m_autoCrop;

         /// <summary>

         /// The automatically detected crop region for this Title.

@@ -130,74 +130,90 @@ namespace Handbrake.Parsing
         /// <returns>A string representing this track in the format: {title #} (00:00:00)</returns>

         public override string ToString()

         {

-            return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours, 

+            return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours,

                 this.m_duration.Minutes, this.m_duration.Seconds);

         }

 

-        public static Title Parse(StreamReader output)

+        public static Title Parse(StringReader output)

         {

             Title thisTitle = new Title();

 

+            // Match track number for this title

+            Match m = Regex.Match(output.ReadLine(), @"^\+ title ([0-9]*):");

+            if (m.Success)

+            {

+                thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value);

+            }

+

+            output.ReadLine();

             /*

-             * This will be converted to use Regex soon, I promise ;)

-             * brianmario - 7/9/07

+            // Match vts, ttn, cell range and block count

+            m = Regex.Match(output.ReadLine(), @"^  \+ vts ([0-9]*), ttn ([0-9]*), cells ([0-9]*)->([0-9]*) \(([0-9]*) blocks\)");

+            if (m.Success)

+            {

+                // We don't need any of those values right now, so we'll just ignore them

+                // and read a line from the buffer to get it out of the way.

+            }

+            */

+

+            // Get duration for this title

+            m = Regex.Match(output.ReadLine(), @"^  \+ duration: ([0-9]{2}:[0-9]{2}:[0-9]{2})");

+            if (m.Success)

+            {

+                thisTitle.m_duration = TimeSpan.Parse(m.Groups[1].Value);

+            }

+

+            // Get resolution, aspect ratio and FPS for this title

+            m = Regex.Match(output.ReadLine(), @"^  \+ size: ([0-9]*)x([0-9]*), aspect: ([0-9]*\.[0-9]*), ([0-9]*\.[0-9]*) fps");

+            if (m.Success)

+            {

+                thisTitle.m_resolution = new Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));

+                thisTitle.m_aspectRatio = float.Parse(m.Groups[3].Value);

+                // we don't need FPS right now

+            }

+

+            // Get autocrop region for this title

+            m = Regex.Match(output.ReadLine(), @"^  \+ autocrop: ([0-9]*)/([0-9]*)/([0-9]*)/([0-9]*)");

+            if (m.Success)

+            {

+                thisTitle.m_autoCrop = new int[4] { int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value), int.Parse(m.Groups[3].Value), int.Parse(m.Groups[4].Value) };

+            }

+

+            /* 

+             * 

+             * A Few Bugs that need fixed.

+             * 

+             * 

+             * Problem 1

+             * There is a small problem here... What happens if the DVD has no Subtitles? or Handbrake misses the Audio or Chapter track 

+             * data due to an error.

+             * 

+             * hbcli will sit in a suspended state until it is forcefully closed.

+             * 

+             * Problem 2

+             * See AudioTrack.cs Line 80 for details

+             * 

+             * Problem 3

+             * Doesn't seem to support DVD's where the first track is 0 instead of 1, and only includes 1 title (TS/MPG files)

+             * Simply Doesn't list any titles.

+             * 

+             * 

              */

-        

-                string curLine = output.ReadLine();

-                thisTitle.m_titleNumber = int.Parse(curLine.Substring(curLine.Length - 2, 1));

-                curLine = output.ReadLine();

-                string[] splitter = curLine.Split(',');

-   

-                splitter = splitter[2].Trim().Split(' ', '(', ')');

-

-                splitter = splitter[1].Split('-', '>');

-

-                curLine = output.ReadLine();

-                splitter = curLine.Split(new string[] { "  + duration: " }, StringSplitOptions.RemoveEmptyEntries);

-                thisTitle.m_duration = TimeSpan.Parse(splitter[0]);

-                curLine = output.ReadLine();

-                splitter = curLine.Split(new string[] { "  + size: ", "aspect: ", ", ", " fps", "x" }, StringSplitOptions.RemoveEmptyEntries);

-                thisTitle.m_resolution = new Size(int.Parse(splitter[0]), int.Parse(splitter[1]));

-                thisTitle.m_aspectRatio = float.Parse(splitter[2].ToString());

-     

-                curLine = output.ReadLine();

-                splitter = curLine.Split(new string[] { "  + autocrop: ", "/" }, StringSplitOptions.RemoveEmptyEntries);

-                thisTitle.m_autoCrop = new int[4] { int.Parse(splitter[0]), int.Parse(splitter[1]), int.Parse(splitter[2]), int.Parse(splitter[3]) };

-

-                /* 

-                 * 

-                 * A Few Bugs that need fixed.

-                 * 

-                 * 

-                 * Problem 1

-                 * There is a small problem here... What happens if the DVD has no Subtitles? or Handbrake misses the Audio or Chapter track 

-                 * data due to an error.

-                 * 

-                 * hbcli will sit in a suspended state until it is forcefully closed.

-                 * 

-                 * Problem 2

-                 * See AudioTrack.cs Line 80 for details

-                 * 

-                 * Problem 3

-                 * Doesn't seem to support DVD's where the first track is 0 instead of 1, and only includes 1 title (TS/MPG files)

-                 * Simply Doesn't list any titles.

-                 * 

-                 * 

-                 */

-         

-                thisTitle.m_chapters.AddRange(Chapter.ParseList(output));

-                thisTitle.m_audioTracks.AddRange(AudioTrack.ParseList(output));

-                thisTitle.m_subtitles.AddRange(Subtitle.ParseList(output));

-            

+

+            thisTitle.m_chapters.AddRange(Chapter.ParseList(output));

+            thisTitle.m_audioTracks.AddRange(AudioTrack.ParseList(output));

+            thisTitle.m_subtitles.AddRange(Subtitle.ParseList(output));

+

             return thisTitle;

         }

 

-        public static Title[] ParseList(StreamReader output)

+        public static Title[] ParseList(string output)

         {

             List<Title> titles = new List<Title>();

-            while ((char)output.Peek() == '+')

+            StringReader sr = new StringReader(output);

+            while ((char)sr.Peek() == '+')

             {

-                titles.Add(Title.Parse(output));

+                titles.Add(Title.Parse(sr));

             }

             return titles.ToArray();

         }

diff --git a/win/C#/frmAbout.Designer.cs b/win/C#/frmAbout.Designer.cs
index a918afd9a..8a0180563 100644
--- a/win/C#/frmAbout.Designer.cs
+++ b/win/C#/frmAbout.Designer.cs
@@ -55,7 +55,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(415, 229);

+            this.btn_close.Location = new System.Drawing.Point(415, 218);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(99, 22);

             this.btn_close.TabIndex = 27;

@@ -117,9 +117,10 @@ namespace Handbrake
             // 

             // frmAbout

             // 

+            this.AcceptButton = this.btn_close;

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

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

-            this.ClientSize = new System.Drawing.Size(526, 259);

+            this.ClientSize = new System.Drawing.Size(526, 252);

             this.Controls.Add(this.Label4);

             this.Controls.Add(this.btn_close);

             this.Controls.Add(this.Version);

@@ -127,8 +128,9 @@ namespace Handbrake
             this.Controls.Add(this.Label2);

             this.Controls.Add(this.PictureBox1);

             this.Controls.Add(this.Label1);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

+            this.MaximizeBox = false;

             this.MaximumSize = new System.Drawing.Size(532, 284);

             this.MinimizeBox = false;

             this.MinimumSize = new System.Drawing.Size(532, 284);

diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs
index d172a5540..7760fc834 100644
--- a/win/C#/frmDvdInfo.Designer.cs
+++ b/win/C#/frmDvdInfo.Designer.cs
@@ -47,10 +47,11 @@ namespace Handbrake
             // 

             // rtf_dvdInfo

             // 

-            this.rtf_dvdInfo.BorderStyle = System.Windows.Forms.BorderStyle.None;

+            this.rtf_dvdInfo.DetectUrls = false;

             this.rtf_dvdInfo.Location = new System.Drawing.Point(16, 51);

             this.rtf_dvdInfo.Name = "rtf_dvdInfo";

-            this.rtf_dvdInfo.Size = new System.Drawing.Size(515, 403);

+            this.rtf_dvdInfo.ReadOnly = true;

+            this.rtf_dvdInfo.Size = new System.Drawing.Size(515, 395);

             this.rtf_dvdInfo.TabIndex = 29;

             this.rtf_dvdInfo.Text = "";

             // 

@@ -61,7 +62,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(421, 462);

+            this.btn_close.Location = new System.Drawing.Point(421, 452);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(110, 22);

             this.btn_close.TabIndex = 28;

@@ -72,12 +73,14 @@ namespace Handbrake
             // 

             // frmDvdInfo

             // 

+            this.AcceptButton = this.btn_close;

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

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

-            this.ClientSize = new System.Drawing.Size(545, 493);

+            this.ClientSize = new System.Drawing.Size(545, 486);

             this.Controls.Add(this.Label2);

             this.Controls.Add(this.rtf_dvdInfo);

             this.Controls.Add(this.btn_close);

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

             this.MaximizeBox = false;

             this.MaximumSize = new System.Drawing.Size(553, 520);

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index f0583e53a..c0513d469 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -239,7 +239,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(291, 402);

+            this.btn_close.Location = new System.Drawing.Point(292, 402);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(107, 22);

             this.btn_close.TabIndex = 53;

@@ -249,15 +249,14 @@ namespace Handbrake
             // 

             // frmOptions

             // 

-            this.ClientSize = new System.Drawing.Size(411, 435);

+            this.ClientSize = new System.Drawing.Size(411, 436);

             this.Controls.Add(this.GroupBox2);

             this.Controls.Add(this.GroupBox3);

             this.Controls.Add(this.GroupBox1);

             this.Controls.Add(this.btn_close);

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

             this.MaximizeBox = false;

-            this.MaximumSize = new System.Drawing.Size(419, 462);

-            this.MinimumSize = new System.Drawing.Size(419, 462);

             this.Name = "frmOptions";

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

             this.Text = "Options";

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 3235428c8..83233e59e 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -168,7 +168,7 @@ namespace Handbrake
             // 

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

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

-            this.ClientSize = new System.Drawing.Size(651, 404);

+            this.ClientSize = new System.Drawing.Size(651, 423);

             this.ControlBox = false;

             this.Controls.Add(this.lbl_progressValue);

             this.Controls.Add(this.label2);

@@ -180,6 +180,7 @@ namespace Handbrake
             this.Controls.Add(this.btn_q_encoder);

             this.Controls.Add(this.list_queue);

             this.Controls.Add(this.btn_Close);

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

             this.MinimumSize = new System.Drawing.Size(659, 431);

             this.Name = "frmQueue";

diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index c92eb44ff..971036feb 100644
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -54,7 +54,7 @@ namespace Handbrake
             this.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

             this.btn_ok.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_ok.Location = new System.Drawing.Point(418, 56);

+            this.btn_ok.Location = new System.Drawing.Point(416, 45);

             this.btn_ok.Name = "btn_ok";

             this.btn_ok.Size = new System.Drawing.Size(71, 22);

             this.btn_ok.TabIndex = 28;

@@ -107,9 +107,10 @@ namespace Handbrake
             // 

             // frmReadDVD

             // 

+            this.AcceptButton = this.btn_ok;

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

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

-            this.ClientSize = new System.Drawing.Size(499, 86);

+            this.ClientSize = new System.Drawing.Size(499, 79);

             this.ControlBox = false;

             this.Controls.Add(this.lbl_progress);

             this.Controls.Add(this.lbl_status);

@@ -118,7 +119,7 @@ namespace Handbrake
             this.Controls.Add(this.Label3);

             this.Controls.Add(this.Label2);

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

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

             this.MaximizeBox = false;

             this.MaximumSize = new System.Drawing.Size(505, 111);

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index f288201e2..f969f9789 100644
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -65,7 +65,6 @@ namespace Handbrake
             hbProc = process.runCli(this, query, true, true, false, true);

 

             Parsing.Parser readData = new Parsing.Parser(hbProc.StandardError.BaseStream);

-            hbProc.WaitForExit();

             hbProc.Close();

 

             // Setup the parser

diff --git a/win/C#/frmSelectDVD.Designer.cs b/win/C#/frmSelectDVD.Designer.cs
index 299800b2b..8e21dae96 100644
--- a/win/C#/frmSelectDVD.Designer.cs
+++ b/win/C#/frmSelectDVD.Designer.cs
@@ -45,7 +45,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(317, 65);

+            this.btn_close.Location = new System.Drawing.Point(317, 53);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(78, 22);

             this.btn_close.TabIndex = 54;

@@ -97,7 +97,7 @@ namespace Handbrake
             this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

             this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_Browse.Location = new System.Drawing.Point(317, 34);

+            this.btn_Browse.Location = new System.Drawing.Point(317, 24);

             this.btn_Browse.Name = "btn_Browse";

             this.btn_Browse.Size = new System.Drawing.Size(78, 22);

             this.btn_Browse.TabIndex = 49;

@@ -117,13 +117,14 @@ namespace Handbrake
             // 

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

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

-            this.ClientSize = new System.Drawing.Size(402, 94);

+            this.ClientSize = new System.Drawing.Size(402, 87);

             this.Controls.Add(this.btn_close);

             this.Controls.Add(this.Label1);

             this.Controls.Add(this.RadioDVD);

             this.Controls.Add(this.RadioISO);

             this.Controls.Add(this.btn_Browse);

             this.Controls.Add(this.text_source);

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

             this.MaximizeBox = false;

             this.MaximumSize = new System.Drawing.Size(410, 121);

diff --git a/win/C#/frmUpdate.Designer.cs b/win/C#/frmUpdate.Designer.cs
index 8406700cb..3dc89ff5b 100644
--- a/win/C#/frmUpdate.Designer.cs
+++ b/win/C#/frmUpdate.Designer.cs
@@ -206,7 +206,7 @@ namespace Handbrake
             // 

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

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

-            this.ClientSize = new System.Drawing.Size(498, 139);

+            this.ClientSize = new System.Drawing.Size(498, 132);

             this.Controls.Add(this.cliVersion);

             this.Controls.Add(this.lbl_cliVersion);

             this.Controls.Add(this.Label6);

@@ -221,7 +221,7 @@ namespace Handbrake
             this.Controls.Add(this.Label2);

             this.Controls.Add(this.btn_update);

             this.Controls.Add(this.Label1);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;

+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

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

             this.MaximizeBox = false;

             this.MaximumSize = new System.Drawing.Size(504, 164);