WinGui:

- Set's DRC to 1 by default.
- Chapter Markers tab only enabled if it's a DVD source or ISO image.
- -X and -Y options now parsed by the query parser.  
- Added a small hack to allow built-in presets to use -X and -Y and have the query generator correctly generate the query.

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

1 files changed, 23 insertions, 4 deletions

diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs
index b66e3f041..a2cb50ed0 100644
--- a/win/C#/frmMain/QueryGenerator.cs
+++ b/win/C#/frmMain/QueryGenerator.cs
@@ -101,11 +101,30 @@ namespace Handbrake
             // Picture Settings Tab

             #region Picture Settings Tab

 

-            if (mainWindow.text_width.Text != "")

-                query += " -w " + mainWindow.text_width.Text;

+            // Use MaxWidth for built-in presets and width for user settings.

+            if (mainWindow.maxWidth == 0)

+            {

+

+                if (mainWindow.text_width.Text != "")

+                    query += " -w " + mainWindow.text_width.Text;

+            }

+            else

+            {

+                if (mainWindow.text_width.Text != "")

+                    query += " -X " + mainWindow.text_width.Text;

+            }

 

-            if (mainWindow.text_height.Text != "")

-                query += " -l " + mainWindow.text_height.Text;

+            // Use MaxHeight for built-in presets and height for user settings.

+            if (mainWindow.maxHeight == 0)

+            {

+                if (mainWindow.text_height.Text != "")

+                    query += " -l " + mainWindow.text_height.Text;

+            }

+            else

+            {

+                if (mainWindow.text_height.Text != "")

+                    query += " -Y " + mainWindow.text_height.Text;

+            }

 

             string cropTop = mainWindow.text_top.Text;

             string cropBottom = mainWindow.text_bottom.Text;