]> granicus.if.org Git - handbrake/commitdiff
WinGui:
authorbrianmario <no-reply@handbrake.fr>
Thu, 19 Jul 2007 03:46:40 +0000 (03:46 +0000)
committerbrianmario <no-reply@handbrake.fr>
Thu, 19 Jul 2007 03:46:40 +0000 (03:46 +0000)
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:
win/C#/Parsing/AudioTrack.cs
win/C#/Parsing/Chapter.cs
win/C#/Parsing/DVD.cs
win/C#/Parsing/Parser.cs
win/C#/Parsing/Subtitle.cs
win/C#/Parsing/Title.cs
win/C#/frmAbout.Designer.cs
win/C#/frmDvdInfo.Designer.cs
win/C#/frmOptions.Designer.cs
win/C#/frmQueue.Designer.cs
win/C#/frmReadDVD.Designer.cs
win/C#/frmReadDVD.cs
win/C#/frmSelectDVD.Designer.cs
win/C#/frmUpdate.Designer.cs

index d23d34748b4415472a1f868eefd27a82da7666c5..98114a5ca4151096f66d2848872a202617715f5a 100644 (file)
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Text;\r
 using System.IO;\r
+using System.Text.RegularExpressions;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
@@ -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);\r
         }\r
 \r
-        public static AudioTrack Parse(StreamReader output)\r
+        public static AudioTrack Parse(StringReader output)\r
         {\r
-            string curLine = output.ReadLine();\r
-            if (!curLine.Contains("  + subtitle tracks:"))\r
+            Match m = Regex.Match(output.ReadLine(), @"^    \+ ([0-9]*), ([A-Za-z0-9]*) \((.*)\) \((.*)\), ([0-9]*)Hz, ([0-9]*)bps");\r
+            if (m.Success)\r
             {\r
                 AudioTrack thisTrack = new AudioTrack();\r
-                string[] splitter = curLine.Split(new string[] { "    + ", ", ", " (", ") (", " ch", "), ", "Hz, ", "bps" }, StringSplitOptions.RemoveEmptyEntries);\r
-                thisTrack.m_trackNumber = int.Parse(splitter[0]);\r
-                thisTrack.m_language = splitter[1];\r
-                thisTrack.m_format = splitter[2];\r
-                /*\r
-                 * Problem 2\r
-                 * Field 'Handbrake.frmMain.hbProc' is never assigned to, and will always have it's default value null.\r
-                 * This happens with "AllAudios.iso" which is a test file. http://www.sr88.co.uk/AllAudios.iso  (~95MB)\r
-                 */\r
-\r
-                thisTrack.m_subFormat = splitter[3];\r
-                thisTrack.m_frequency = int.Parse(splitter[4]);\r
-                thisTrack.m_bitrate = int.Parse(splitter[5]);\r
+                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value);\r
+                thisTrack.m_language = m.Groups[2].Value;\r
+                thisTrack.m_format = m.Groups[3].Value;\r
+                thisTrack.m_subFormat = m.Groups[4].Value;\r
+                thisTrack.m_frequency = int.Parse(m.Groups[5].Value);\r
+                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value);\r
                 return thisTrack;\r
             }\r
             else\r
@@ -118,10 +112,10 @@ namespace Handbrake.Parsing
             }\r
         }\r
 \r
-        public static AudioTrack[] ParseList(StreamReader output)\r
+        public static AudioTrack[] ParseList(StringReader output)\r
         {\r
             List<AudioTrack> tracks = new List<AudioTrack>();\r
-            while (true) // oh glorious hack, serve me well\r
+            while (true)\r
             {\r
                 AudioTrack thisTrack = AudioTrack.Parse(output);\r
                 if (thisTrack != null)\r
index c824fcd685ad1afd005fd7c34bb3a671b5c76be7..665841e978b00243c7e37df74714ecb4c81f1d10 100644 (file)
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Text;\r
 using System.IO;\r
+using System.Text.RegularExpressions;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
@@ -43,15 +44,14 @@ namespace Handbrake.Parsing
             return this.m_chapterNumber.ToString();\r
         }\r
 \r
-        public static Chapter Parse(StreamReader output)\r
+        public static Chapter Parse(StringReader output)\r
         {\r
-            string curLine = output.ReadLine();\r
-            if (!curLine.Contains("  + audio tracks:"))\r
+            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})");\r
+            if (m.Success)\r
             {\r
                 Chapter thisChapter = new Chapter();\r
-                string[] splitter = curLine.Split(new string[] { "    + ", ": cells ", ", ", " blocks, duration ", "->" }, StringSplitOptions.RemoveEmptyEntries);\r
-                thisChapter.m_chapterNumber = int.Parse(splitter[0]);\r
-                thisChapter.m_duration = TimeSpan.Parse(splitter[4]);\r
+                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value);\r
+                thisChapter.m_duration = TimeSpan.Parse(m.Groups[5].Value);\r
                 return thisChapter;\r
             }\r
             else\r
@@ -60,14 +60,19 @@ namespace Handbrake.Parsing
             }\r
         }\r
 \r
-        public static Chapter[] ParseList(StreamReader output)\r
+        public static Chapter[] ParseList(StringReader output)\r
         {\r
             List<Chapter> chapters = new List<Chapter>();\r
-            string curLine = output.ReadLine();\r
-            while (!curLine.Contains("  + audio tracks:"))\r
+\r
+            // this is to read the "  + chapters:" line from the buffer\r
+            // so we can start reading the chapters themselvs\r
+            output.ReadLine();\r
+\r
+            while (true)\r
             {\r
+                // Start of the chapter list for this Title\r
                 Chapter thisChapter = Chapter.Parse(output);\r
-           \r
+\r
                 if (thisChapter != null)\r
                 {\r
                     chapters.Add(thisChapter);\r
index 1c2e0d0e788722a65b3736e8f6feb6aaf6f25632..02596124042d2c2c92a3f60968a717e6fe484361 100644 (file)
@@ -2,8 +2,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Text;\r
 using System.IO;\r
-using System.Windows.Forms;\r
-\r
+using System.Text.RegularExpressions;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
@@ -37,11 +36,13 @@ namespace Handbrake.Parsing
             DVD thisDVD = new DVD();\r
             while (!output.EndOfStream)\r
             {\r
-                string curLine = output.ReadLine();\r
-\r
-                if (curLine.Contains("Scanning title"))\r
+                if ((char)output.Peek() == '+')\r
+                {\r
+                    thisDVD.m_titles.AddRange(Title.ParseList(output.ReadToEnd()));\r
+                }\r
+                else\r
                 {\r
-                    thisDVD.m_titles.AddRange(Title.ParseList(output));\r
+                    output.ReadLine();\r
                 }\r
             }\r
             return thisDVD;\r
index ef6476f7808ddca9bef2b8dbbd040ab62a43abf7..afd5471d00fced2d191ca877452f756d94036026 100644 (file)
@@ -13,6 +13,12 @@ namespace Handbrake.Parsing
     /// <param name="Data">The data parsed from the stream</param>\r
     public delegate void DataReadEventHandler(object Sender, string Data);\r
 \r
+    /// <summary>\r
+    /// A delegate to handle events regarding progress during DVD scanning\r
+    /// </summary>\r
+    /// <param name="Sender">The object who's raising the event</param>\r
+    /// <param name="CurrentTitle">The title number currently being processed</param>\r
+    /// <param name="TitleCount">The total number of titiles to be processed</param>\r
     public delegate void ScanProgressEventHandler(object Sender, int CurrentTitle, int TitleCount);\r
 \r
     /// <summary>\r
@@ -42,6 +48,9 @@ namespace Handbrake.Parsing
         /// </summary>\r
         public static event DataReadEventHandler OnReadToEnd;\r
 \r
+        /// <summary>\r
+        /// Raised upon the catching of a "Scanning title # of #..." in the stream\r
+        /// </summary>\r
         public static event ScanProgressEventHandler OnScanProgress;\r
 \r
         /// <summary>\r
index 66cc07843112ce7037d2e7431d8655840922ff3e..a30fd7882df90ebdb5ee1f4b23088681866e61d7 100644 (file)
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;\r
 using System.Text;\r
 using System.IO;\r
+using System.Text.RegularExpressions;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
@@ -43,15 +44,15 @@ namespace Handbrake.Parsing
             return string.Format("{0} {1}", this.m_trackNumber, this.m_language);\r
         }\r
 \r
-        public static Subtitle Parse(StreamReader output)\r
+        public static Subtitle Parse(StringReader output)\r
         {\r
             string curLine = output.ReadLine();\r
-            if (!curLine.Contains("HandBrake has exited."))\r
+            Match m = Regex.Match(curLine, @"^    \+ ([0-9]*), ([A-Za-z]*) \((.*)\)");\r
+            if (m.Success && !curLine.Contains("HandBrake has exited."))\r
             {\r
                 Subtitle thisSubtitle = new Subtitle();\r
-                string[] splitter = curLine.Split(new string[] { "    + ", ", " }, StringSplitOptions.RemoveEmptyEntries);\r
-                thisSubtitle.m_trackNumber = int.Parse(splitter[0]);\r
-                thisSubtitle.m_language = splitter[1];\r
+                thisSubtitle.m_trackNumber = int.Parse(m.Groups[1].Value);\r
+                thisSubtitle.m_language = m.Groups[2].Value;\r
                 return thisSubtitle;\r
             }\r
             else\r
@@ -60,10 +61,10 @@ namespace Handbrake.Parsing
             }\r
         }\r
 \r
-        public static Subtitle[] ParseList(StreamReader output)\r
+        public static Subtitle[] ParseList(StringReader output)\r
         {\r
             List<Subtitle> subtitles = new List<Subtitle>();\r
-            while ((char)output.Peek() != '+') // oh glorious hack, serve me well\r
+            while ((char)output.Peek() != '+')\r
             {\r
                 Subtitle thisSubtitle = Subtitle.Parse(output);\r
 \r
index 6f3574f6799ba2e9d51737eb5684665a87b4cc47..933be6d2d3aa4143fa64454dbfd647a32b9e0ba2 100644 (file)
@@ -4,6 +4,7 @@ using System.Text;
 using System.Drawing;\r
 using System.IO;\r
 using System.Windows.Forms;\r
+using System.Text.RegularExpressions;\r
 \r
 namespace Handbrake.Parsing\r
 {\r
@@ -96,7 +97,6 @@ namespace Handbrake.Parsing
             }\r
         }\r
 \r
-\r
         private int[] m_autoCrop;\r
         /// <summary>\r
         /// The automatically detected crop region for this Title.\r
@@ -130,74 +130,90 @@ namespace Handbrake.Parsing
         /// <returns>A string representing this track in the format: {title #} (00:00:00)</returns>\r
         public override string ToString()\r
         {\r
-            return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours, \r
+            return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours,\r
                 this.m_duration.Minutes, this.m_duration.Seconds);\r
         }\r
 \r
-        public static Title Parse(StreamReader output)\r
+        public static Title Parse(StringReader output)\r
         {\r
             Title thisTitle = new Title();\r
 \r
+            // Match track number for this title\r
+            Match m = Regex.Match(output.ReadLine(), @"^\+ title ([0-9]*):");\r
+            if (m.Success)\r
+            {\r
+                thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value);\r
+            }\r
+\r
+            output.ReadLine();\r
             /*\r
-             * This will be converted to use Regex soon, I promise ;)\r
-             * brianmario - 7/9/07\r
+            // Match vts, ttn, cell range and block count\r
+            m = Regex.Match(output.ReadLine(), @"^  \+ vts ([0-9]*), ttn ([0-9]*), cells ([0-9]*)->([0-9]*) \(([0-9]*) blocks\)");\r
+            if (m.Success)\r
+            {\r
+                // We don't need any of those values right now, so we'll just ignore them\r
+                // and read a line from the buffer to get it out of the way.\r
+            }\r
+            */\r
+\r
+            // Get duration for this title\r
+            m = Regex.Match(output.ReadLine(), @"^  \+ duration: ([0-9]{2}:[0-9]{2}:[0-9]{2})");\r
+            if (m.Success)\r
+            {\r
+                thisTitle.m_duration = TimeSpan.Parse(m.Groups[1].Value);\r
+            }\r
+\r
+            // Get resolution, aspect ratio and FPS for this title\r
+            m = Regex.Match(output.ReadLine(), @"^  \+ size: ([0-9]*)x([0-9]*), aspect: ([0-9]*\.[0-9]*), ([0-9]*\.[0-9]*) fps");\r
+            if (m.Success)\r
+            {\r
+                thisTitle.m_resolution = new Size(int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));\r
+                thisTitle.m_aspectRatio = float.Parse(m.Groups[3].Value);\r
+                // we don't need FPS right now\r
+            }\r
+\r
+            // Get autocrop region for this title\r
+            m = Regex.Match(output.ReadLine(), @"^  \+ autocrop: ([0-9]*)/([0-9]*)/([0-9]*)/([0-9]*)");\r
+            if (m.Success)\r
+            {\r
+                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) };\r
+            }\r
+\r
+            /* \r
+             * \r
+             * A Few Bugs that need fixed.\r
+             * \r
+             * \r
+             * Problem 1\r
+             * There is a small problem here... What happens if the DVD has no Subtitles? or Handbrake misses the Audio or Chapter track \r
+             * data due to an error.\r
+             * \r
+             * hbcli will sit in a suspended state until it is forcefully closed.\r
+             * \r
+             * Problem 2\r
+             * See AudioTrack.cs Line 80 for details\r
+             * \r
+             * Problem 3\r
+             * Doesn't seem to support DVD's where the first track is 0 instead of 1, and only includes 1 title (TS/MPG files)\r
+             * Simply Doesn't list any titles.\r
+             * \r
+             * \r
              */\r
-        \r
-                string curLine = output.ReadLine();\r
-                thisTitle.m_titleNumber = int.Parse(curLine.Substring(curLine.Length - 2, 1));\r
-                curLine = output.ReadLine();\r
-                string[] splitter = curLine.Split(',');\r
-   \r
-                splitter = splitter[2].Trim().Split(' ', '(', ')');\r
-\r
-                splitter = splitter[1].Split('-', '>');\r
-\r
-                curLine = output.ReadLine();\r
-                splitter = curLine.Split(new string[] { "  + duration: " }, StringSplitOptions.RemoveEmptyEntries);\r
-                thisTitle.m_duration = TimeSpan.Parse(splitter[0]);\r
-                curLine = output.ReadLine();\r
-                splitter = curLine.Split(new string[] { "  + size: ", "aspect: ", ", ", " fps", "x" }, StringSplitOptions.RemoveEmptyEntries);\r
-                thisTitle.m_resolution = new Size(int.Parse(splitter[0]), int.Parse(splitter[1]));\r
-                thisTitle.m_aspectRatio = float.Parse(splitter[2].ToString());\r
-     \r
-                curLine = output.ReadLine();\r
-                splitter = curLine.Split(new string[] { "  + autocrop: ", "/" }, StringSplitOptions.RemoveEmptyEntries);\r
-                thisTitle.m_autoCrop = new int[4] { int.Parse(splitter[0]), int.Parse(splitter[1]), int.Parse(splitter[2]), int.Parse(splitter[3]) };\r
-\r
-                /* \r
-                 * \r
-                 * A Few Bugs that need fixed.\r
-                 * \r
-                 * \r
-                 * Problem 1\r
-                 * There is a small problem here... What happens if the DVD has no Subtitles? or Handbrake misses the Audio or Chapter track \r
-                 * data due to an error.\r
-                 * \r
-                 * hbcli will sit in a suspended state until it is forcefully closed.\r
-                 * \r
-                 * Problem 2\r
-                 * See AudioTrack.cs Line 80 for details\r
-                 * \r
-                 * Problem 3\r
-                 * Doesn't seem to support DVD's where the first track is 0 instead of 1, and only includes 1 title (TS/MPG files)\r
-                 * Simply Doesn't list any titles.\r
-                 * \r
-                 * \r
-                 */\r
-         \r
-                thisTitle.m_chapters.AddRange(Chapter.ParseList(output));\r
-                thisTitle.m_audioTracks.AddRange(AudioTrack.ParseList(output));\r
-                thisTitle.m_subtitles.AddRange(Subtitle.ParseList(output));\r
-            \r
+\r
+            thisTitle.m_chapters.AddRange(Chapter.ParseList(output));\r
+            thisTitle.m_audioTracks.AddRange(AudioTrack.ParseList(output));\r
+            thisTitle.m_subtitles.AddRange(Subtitle.ParseList(output));\r
+\r
             return thisTitle;\r
         }\r
 \r
-        public static Title[] ParseList(StreamReader output)\r
+        public static Title[] ParseList(string output)\r
         {\r
             List<Title> titles = new List<Title>();\r
-            while ((char)output.Peek() == '+')\r
+            StringReader sr = new StringReader(output);\r
+            while ((char)sr.Peek() == '+')\r
             {\r
-                titles.Add(Title.Parse(output));\r
+                titles.Add(Title.Parse(sr));\r
             }\r
             return titles.ToArray();\r
         }\r
index a918afd9a43d4a3f1a3ea4ced1632e8cd5080e22..8a018056398633a5f86f0061625735ac9198a58b 100644 (file)
@@ -55,7 +55,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_close.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(415, 229);\r
+            this.btn_close.Location = new System.Drawing.Point(415, 218);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(99, 22);\r
             this.btn_close.TabIndex = 27;\r
@@ -117,9 +117,10 @@ namespace Handbrake
             // \r
             // frmAbout\r
             // \r
+            this.AcceptButton = this.btn_close;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(526, 259);\r
+            this.ClientSize = new System.Drawing.Size(526, 252);\r
             this.Controls.Add(this.Label4);\r
             this.Controls.Add(this.btn_close);\r
             this.Controls.Add(this.Version);\r
@@ -127,8 +128,9 @@ namespace Handbrake
             this.Controls.Add(this.Label2);\r
             this.Controls.Add(this.PictureBox1);\r
             this.Controls.Add(this.Label1);\r
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
+            this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(532, 284);\r
             this.MinimizeBox = false;\r
             this.MinimumSize = new System.Drawing.Size(532, 284);\r
index d172a554009a8c06f9f0db4920019d6cb1642714..7760fc83405fa9a563eb4e19c382255be119a07d 100644 (file)
@@ -47,10 +47,11 @@ namespace Handbrake
             // \r
             // rtf_dvdInfo\r
             // \r
-            this.rtf_dvdInfo.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
+            this.rtf_dvdInfo.DetectUrls = false;\r
             this.rtf_dvdInfo.Location = new System.Drawing.Point(16, 51);\r
             this.rtf_dvdInfo.Name = "rtf_dvdInfo";\r
-            this.rtf_dvdInfo.Size = new System.Drawing.Size(515, 403);\r
+            this.rtf_dvdInfo.ReadOnly = true;\r
+            this.rtf_dvdInfo.Size = new System.Drawing.Size(515, 395);\r
             this.rtf_dvdInfo.TabIndex = 29;\r
             this.rtf_dvdInfo.Text = "";\r
             // \r
@@ -61,7 +62,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(421, 462);\r
+            this.btn_close.Location = new System.Drawing.Point(421, 452);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(110, 22);\r
             this.btn_close.TabIndex = 28;\r
@@ -72,12 +73,14 @@ namespace Handbrake
             // \r
             // frmDvdInfo\r
             // \r
+            this.AcceptButton = this.btn_close;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(545, 493);\r
+            this.ClientSize = new System.Drawing.Size(545, 486);\r
             this.Controls.Add(this.Label2);\r
             this.Controls.Add(this.rtf_dvdInfo);\r
             this.Controls.Add(this.btn_close);\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(553, 520);\r
index f0583e53a330a9f899ad436b17ff2a6a32bdd445..c0513d469e3694298fb586ff970c3346e1806c37 100644 (file)
@@ -239,7 +239,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(291, 402);\r
+            this.btn_close.Location = new System.Drawing.Point(292, 402);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(107, 22);\r
             this.btn_close.TabIndex = 53;\r
@@ -249,15 +249,14 @@ namespace Handbrake
             // \r
             // frmOptions\r
             // \r
-            this.ClientSize = new System.Drawing.Size(411, 435);\r
+            this.ClientSize = new System.Drawing.Size(411, 436);\r
             this.Controls.Add(this.GroupBox2);\r
             this.Controls.Add(this.GroupBox3);\r
             this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.btn_close);\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
-            this.MaximumSize = new System.Drawing.Size(419, 462);\r
-            this.MinimumSize = new System.Drawing.Size(419, 462);\r
             this.Name = "frmOptions";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Options";\r
index 3235428c8fe453c94438c8c9b154f869420ca4ef..83233e59e4e748e1981cea5d8cb7b8c7ef74d60e 100644 (file)
@@ -168,7 +168,7 @@ namespace Handbrake
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(651, 404);\r
+            this.ClientSize = new System.Drawing.Size(651, 423);\r
             this.ControlBox = false;\r
             this.Controls.Add(this.lbl_progressValue);\r
             this.Controls.Add(this.label2);\r
@@ -180,6 +180,7 @@ namespace Handbrake
             this.Controls.Add(this.btn_q_encoder);\r
             this.Controls.Add(this.list_queue);\r
             this.Controls.Add(this.btn_Close);\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MinimumSize = new System.Drawing.Size(659, 431);\r
             this.Name = "frmQueue";\r
index c92eb44ff86cc0ba5fdc472c1ee56d821c397d98..971036feba352e41cbb326d888b9fd4d93054308 100644 (file)
@@ -54,7 +54,7 @@ namespace Handbrake
             this.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_ok.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_ok.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_ok.Location = new System.Drawing.Point(418, 56);\r
+            this.btn_ok.Location = new System.Drawing.Point(416, 45);\r
             this.btn_ok.Name = "btn_ok";\r
             this.btn_ok.Size = new System.Drawing.Size(71, 22);\r
             this.btn_ok.TabIndex = 28;\r
@@ -107,9 +107,10 @@ namespace Handbrake
             // \r
             // frmReadDVD\r
             // \r
+            this.AcceptButton = this.btn_ok;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(499, 86);\r
+            this.ClientSize = new System.Drawing.Size(499, 79);\r
             this.ControlBox = false;\r
             this.Controls.Add(this.lbl_progress);\r
             this.Controls.Add(this.lbl_status);\r
@@ -118,7 +119,7 @@ namespace Handbrake
             this.Controls.Add(this.Label3);\r
             this.Controls.Add(this.Label2);\r
             this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(505, 111);\r
index f288201e25a6065da4bc0973a0f4a8e8b5ff26e2..f969f9789bc57af8e0300a6d490bb5c832e10f3b 100644 (file)
@@ -65,7 +65,6 @@ namespace Handbrake
             hbProc = process.runCli(this, query, true, true, false, true);\r
 \r
             Parsing.Parser readData = new Parsing.Parser(hbProc.StandardError.BaseStream);\r
-            hbProc.WaitForExit();\r
             hbProc.Close();\r
 \r
             // Setup the parser\r
index 299800b2b1fc93845ed5a3f5173a96b18de2dbd3..8e21dae962d916c7dd50ca5aab139168561cda51 100644 (file)
@@ -45,7 +45,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(317, 65);\r
+            this.btn_close.Location = new System.Drawing.Point(317, 53);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(78, 22);\r
             this.btn_close.TabIndex = 54;\r
@@ -97,7 +97,7 @@ namespace Handbrake
             this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_Browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_Browse.Location = new System.Drawing.Point(317, 34);\r
+            this.btn_Browse.Location = new System.Drawing.Point(317, 24);\r
             this.btn_Browse.Name = "btn_Browse";\r
             this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
             this.btn_Browse.TabIndex = 49;\r
@@ -117,13 +117,14 @@ namespace Handbrake
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(402, 94);\r
+            this.ClientSize = new System.Drawing.Size(402, 87);\r
             this.Controls.Add(this.btn_close);\r
             this.Controls.Add(this.Label1);\r
             this.Controls.Add(this.RadioDVD);\r
             this.Controls.Add(this.RadioISO);\r
             this.Controls.Add(this.btn_Browse);\r
             this.Controls.Add(this.text_source);\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(410, 121);\r
index 8406700cbf6e001817480401c67b7eeb27c0eb60..3dc89ff5b547421aa0709527134acd9bf5e61aed 100644 (file)
@@ -206,7 +206,7 @@ namespace Handbrake
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(498, 139);\r
+            this.ClientSize = new System.Drawing.Size(498, 132);\r
             this.Controls.Add(this.cliVersion);\r
             this.Controls.Add(this.lbl_cliVersion);\r
             this.Controls.Add(this.Label6);\r
@@ -221,7 +221,7 @@ namespace Handbrake
             this.Controls.Add(this.Label2);\r
             this.Controls.Add(this.btn_update);\r
             this.Controls.Add(this.Label1);\r
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;\r
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(504, 164);\r