WinGui:

- Couple of bug fixes. Crop, -f option, typo

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 8ef4b3b8d111a2833a48ede06c03c57af3de7a35..01c337817b0e27e24f6ade6b78d6b1231cdb5934 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -108,26 +108,7 @@ namespace Handbrake.Functions
 \r
             // Picture Settings Tab\r
             #region Picture\r
-\r
-            if (presetQuery.CropTop == "0" && presetQuery.CropBottom == "0" && presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")\r
-            {\r
-                mainWindow.check_customCrop.Checked = true;\r
-                mainWindow.text_top.Text = "0";\r
-                mainWindow.text_bottom.Text = "0";\r
-                mainWindow.text_left.Text = "0";\r
-                mainWindow.text_right.Text = "0";\r
-            }\r
-            else if (presetQuery.CropTop != null && presetQuery.CropBottom != null && presetQuery.CropLeft != null && presetQuery.CropRight != null)\r
-            {\r
-                mainWindow.check_customCrop.Checked = true;\r
-                mainWindow.text_top.Text = presetQuery.CropTop;\r
-                mainWindow.text_bottom.Text = presetQuery.CropBottom;\r
-                mainWindow.text_left.Text = presetQuery.CropLeft;\r
-                mainWindow.text_right.Text = presetQuery.CropRight;\r
-            }\r
-            else\r
-                mainWindow.check_autoCrop.Checked = true;\r
-\r
+            mainWindow.check_autoCrop.Checked = true;\r
             mainWindow.drp_deInterlace_option.Text = presetQuery.DeInterlace;\r
             mainWindow.drp_deNoise.Text = presetQuery.DeNoise;\r
 \r
@@ -499,6 +480,8 @@ namespace Handbrake.Functions
         {\r
             string query = "";\r
 \r
+            query += " -f " + mainWindow.drop_format.Text.ToLower().Replace(" file", "");\r
+\r
             // Picture Settings Tab\r
             #region Picture Settings Tab\r
 \r

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index f819ab1b3a464f0b98a548b3c0b2d6dc7c76569e..a2205fcb7afb9c74716cf3c27c321eae95f91600 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -192,7 +192,7 @@ namespace Handbrake.Parsing
                  * we expect to be in the output, so read one line ahead to skip over the unknown line\r
                  */\r
 \r
-                if ((char)sr.Peek() != '[' && (char)sr.Peek() != '+' && (char)sr.Peek() != null) // Hack, Fix later\r
+                if ((char)sr.Peek() != '[' && (char)sr.Peek() != '+' ) // Hack, Fix later\r
                     sr.ReadLine();\r
             }\r
 \r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 7555735b436e78157c16ef587537dc52e4a069c2..3ee7e5c365a3ce7d6af4ec53e8d9c73aaefabe9b 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -500,7 +500,7 @@ namespace Handbrake
             this.label8.Name = "label8";\r
             this.label8.Size = new System.Drawing.Size(131, 13);\r
             this.label8.TabIndex = 61;\r
-            this.label8.Text = "Handbrake Options";\r
+            this.label8.Text = "HandBrake Options";\r
             // \r
             // pictureBox2\r
             // \r

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 21dfa650521f38002ae61e88338cf94d2bd121d6..8ecedc8ddeb91eaf19cf1950d6b9e659988d7a32 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -75,7 +75,7 @@ namespace Handbrake
                     throw new Exception("Unable to retrieve the DVD Info. dvdinfo.dat is missing. \nExpected location of dvdinfo.dat: \n" + dvdInfoPath);\r
                 }\r
 \r
-                using (StreamReader sr = new StreamReader(dvdInfoPath))\r
+                using (StreamReader sr = new StreamReader("c:\\dvdinfo.dat"))\r
                 {\r
                     thisDvd = Parsing.DVD.Parse(sr);\r
                     sr.Close();\r