From: sr55 <sr55@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Date: Thu, 18 Sep 2008 16:51:49 +0000 (+0000)
Subject: WinGui:
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae9efd6e1d645ed133789947ffcb6815dd44e88a;p=handbrake-jp%2Fhandbrake-jp-git.git

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

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index 8ef4b3b8..01c33781 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -108,26 +108,7 @@ namespace Handbrake.Functions
 
             // Picture Settings Tab
             #region Picture
-
-            if (presetQuery.CropTop == "0" && presetQuery.CropBottom == "0" && presetQuery.CropLeft == "0" && presetQuery.CropRight == "0")
-            {
-                mainWindow.check_customCrop.Checked = true;
-                mainWindow.text_top.Text = "0";
-                mainWindow.text_bottom.Text = "0";
-                mainWindow.text_left.Text = "0";
-                mainWindow.text_right.Text = "0";
-            }
-            else if (presetQuery.CropTop != null && presetQuery.CropBottom != null && presetQuery.CropLeft != null && presetQuery.CropRight != null)
-            {
-                mainWindow.check_customCrop.Checked = true;
-                mainWindow.text_top.Text = presetQuery.CropTop;
-                mainWindow.text_bottom.Text = presetQuery.CropBottom;
-                mainWindow.text_left.Text = presetQuery.CropLeft;
-                mainWindow.text_right.Text = presetQuery.CropRight;
-            }
-            else
-                mainWindow.check_autoCrop.Checked = true;
-
+            mainWindow.check_autoCrop.Checked = true;
             mainWindow.drp_deInterlace_option.Text = presetQuery.DeInterlace;
             mainWindow.drp_deNoise.Text = presetQuery.DeNoise;
 
@@ -499,6 +480,8 @@ namespace Handbrake.Functions
         {
             string query = "";
 
+            query += " -f " + mainWindow.drop_format.Text.ToLower().Replace(" file", "");
+
             // Picture Settings Tab
             #region Picture Settings Tab
 
diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index f819ab1b..a2205fcb 100644
--- 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
                  */
 
-                if ((char)sr.Peek() != '[' && (char)sr.Peek() != '+' && (char)sr.Peek() != null) // Hack, Fix later
+                if ((char)sr.Peek() != '[' && (char)sr.Peek() != '+' ) // Hack, Fix later
                     sr.ReadLine();
             }
 
diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 7555735b..3ee7e5c3 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -500,7 +500,7 @@ namespace Handbrake
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(131, 13);
             this.label8.TabIndex = 61;
-            this.label8.Text = "Handbrake Options";
+            this.label8.Text = "HandBrake Options";
             // 
             // pictureBox2
             // 
diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 21dfa650..8ecedc8d 100644
--- 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);
                 }
 
-                using (StreamReader sr = new StreamReader(dvdInfoPath))
+                using (StreamReader sr = new StreamReader("c:\\dvdinfo.dat"))
                 {
                     thisDvd = Parsing.DVD.Parse(sr);
                     sr.Close();