WinGui:

- If crop values are stored in the preset and the user has decided to enable them in the preset, the gui will not longer reset the crop panel on title change.

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

1 files changed, 8 insertions, 1 deletions

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index b6fda2d32..546ef4efb 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -37,6 +37,7 @@ namespace Handbrake
         private SourceType selectedSourceType;

         private string dvdDrivePath;

         private string dvdDriveLabel;

+        private Preset CurrentlySelectedPreset;

 

         // Delegates **********************************************************

         private delegate void UpdateWindowHandler();

@@ -283,6 +284,7 @@ namespace Handbrake
         private void changePresetLabel(object sender, EventArgs e)

         {

             labelPreset.Text = "Output Settings (Preset: Custom)";

+            CurrentlySelectedPreset = null;

         }

 

         private static void frmMain_DragEnter(object sender, DragEventArgs e)

@@ -578,7 +580,8 @@ namespace Handbrake
             {

                 // Ok, so, we've selected a preset. Now we want to load it.

                 string presetName = treeView_presets.SelectedNode.Text;

-                if (presetHandler.GetPreset(presetName) != null)

+                Preset preset = presetHandler.GetPreset(presetName);

+                if (preset != null)

                 {

                     string query = presetHandler.GetPreset(presetName).Query;

                     Boolean loadPictureSettings = presetHandler.GetPreset(presetName).PictureSettings;

@@ -597,6 +600,9 @@ namespace Handbrake
                         // The x264 widgets will need updated, so do this now:

                         x264Panel.X264_StandardizeOptString();

                         x264Panel.X264_SetCurrentSettingsInPanel();

+

+                        // Finally, let this window have a copy of the preset settings.

+                        CurrentlySelectedPreset = preset;

                     }

                 }

             }

@@ -903,6 +909,7 @@ namespace Handbrake
             {

                 selectedTitle = drp_dvdtitle.SelectedItem as Title;

                 lbl_duration.Text = selectedTitle.Duration.ToString();

+                PictureSettings.CurrentlySelectedPreset = CurrentlySelectedPreset;

                 PictureSettings.Source = selectedTitle;  // Setup Picture Settings Tab Control

 

                 // Populate the Angles dropdown