WinGui:

- Updated PictureSettings code from darkassassin + a few bug fixes.
- Reset to .NET framework 2.0

Note: this code is not quite ready for usage yet, wait for a few more checkins

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

2 files changed, 11 insertions, 15 deletions

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index 030eca6cc..051f3092c 100644
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -88,10 +88,6 @@ namespace Handbrake.Functions
 

             // Aspect Ratio

             mainWindow.PictureSettings.check_KeepAR.CheckState = presetQuery.keepDisplayAsect ? CheckState.Checked : CheckState.Unchecked;

-

-            // Reset maxWidth and MaxHeight to 0

-            mainWindow.PictureSettings.maxWidth = 0;

-            mainWindow.PictureSettings.maxHeight = 0;

                 

             // Set the Width and height as Required.

             if (presetQuery.Width != 0)

@@ -104,13 +100,13 @@ namespace Handbrake.Functions
             if (presetQuery.MaxWidth != 0)

             {

                 mainWindow.PictureSettings.text_width.Value = presetQuery.MaxWidth;

-                mainWindow.PictureSettings.maxWidth = presetQuery.MaxWidth;

+                mainWindow.PictureSettings.MaximumWidth = presetQuery.MaxWidth;

             }

 

             if (presetQuery.MaxHeight != 0)

             {

                 mainWindow.PictureSettings.text_height.Value = presetQuery.MaxHeight;

-                mainWindow.PictureSettings.maxHeight = presetQuery.MaxHeight;

+                mainWindow.PictureSettings.MaximumHeight = presetQuery.MaxHeight;

             }

 

             // Case where both height and max height are 0 - For built-in presets

@@ -124,10 +120,10 @@ namespace Handbrake.Functions
             mainWindow.PictureSettings.setMax();

 

             // Custom Anamorphic Controls

-            mainWindow.PictureSettings.txt_displayWidth.Text = presetQuery.displayWidthValue.ToString();

-            mainWindow.PictureSettings.txt_parWidth.Text = presetQuery.pixelAspectWidth.ToString();

-            mainWindow.PictureSettings.txt_parHeight.Text = presetQuery.pixelAspectHeight.ToString();

-            mainWindow.PictureSettings.drop_modulus.SelectedItem = presetQuery.AnamorphicModulus;

+            mainWindow.PictureSettings.updownDisplayWidth.Text = presetQuery.displayWidthValue.ToString();

+            mainWindow.PictureSettings.updownParHeight.Text = presetQuery.pixelAspectWidth.ToString();

+            mainWindow.PictureSettings.updownParWidth.Text = presetQuery.pixelAspectHeight.ToString();

+            mainWindow.PictureSettings.drp_modulus.SelectedItem = presetQuery.AnamorphicModulus;

 

             #endregion

 

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 981e2641b..f0d19924b 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -119,7 +119,7 @@ namespace Handbrake.Functions
             #region Picture Settings Tab

 

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

-            if (mainWindow.PictureSettings.maxWidth == 0)

+            if (mainWindow.PictureSettings.MaximumWidth == 0)

             {

 

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

@@ -133,7 +133,7 @@ namespace Handbrake.Functions
             }

 

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

-            if (mainWindow.PictureSettings.maxHeight == 0)

+            if (mainWindow.PictureSettings.MaximumHeight == 0)

             {

                 if (mainWindow.PictureSettings.text_height.Text != "0")

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

@@ -175,11 +175,11 @@ namespace Handbrake.Functions
                     break;

                 case 3:

                     query += " --custom-anamorphic ";

-                    query += " --display-width " + mainWindow.PictureSettings.txt_displayWidth.Text + " ";

+                    query += " --display-width " + mainWindow.PictureSettings.updownDisplayWidth.Text + " ";

                     if (mainWindow.PictureSettings.check_KeepAR.Checked)

                         query += " --keep-display-aspect ";

-                    if (mainWindow.PictureSettings.txt_parWidth.Text != "" && mainWindow.PictureSettings.txt_parHeight.Text != "")

-                        query += " --pixel-aspect " + mainWindow.PictureSettings.txt_parWidth.Text + ":" + mainWindow.PictureSettings.txt_parHeight.Text + " ";

+                    if (mainWindow.PictureSettings.updownParWidth.Text != "" && mainWindow.PictureSettings.updownParHeight.Text != "")

+                        query += " --pixel-aspect " + mainWindow.PictureSettings.updownParWidth.Text + ":" + mainWindow.PictureSettings.updownParHeight.Text + " ";

                     break;

             }

             #endregion