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

1 files changed, 6 insertions, 10 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