From 2b82b98c040ab7579e5c5c07e20aa017c23d0fef Mon Sep 17 00:00:00 2001 From: sr55 Date: Fri, 8 Aug 2008 17:08:14 +0000 Subject: WinGui: - Bug Fixes in QueryParser.cs and PresetLoader - Fixes a bug where an incorrect cropping option get's chosen when a preset is loaded. - No longer loads Source or destination from the preset. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1619 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Functions/Common.cs | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'win/C#/Functions/Common.cs') diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs index 3f68b6346..19029fdb1 100644 --- a/win/C#/Functions/Common.cs +++ b/win/C#/Functions/Common.cs @@ -197,10 +197,7 @@ namespace Handbrake.Functions mainWindow.check_iPodAtom.CheckState = CheckState.Unchecked; // Now load all the new settings onto the main window - if (presetQuery.Source != "") - mainWindow.text_source.Text = presetQuery.Source; - - selectLongestTitle(mainWindow); + mainWindow.drp_dvdtitle.Text = "Automatic"; mainWindow.drop_chapterStart.Text = "Auto"; mainWindow.drop_chapterFinish.Text = "Auto"; @@ -220,9 +217,6 @@ namespace Handbrake.Functions // Destination tab #region destination - if (presetQuery.Destination != "") - mainWindow.text_destination.Text = presetQuery.Destination; - mainWindow.drp_videoEncoder.Text = presetQuery.VideoEncoder; if (presetQuery.Format != null) @@ -251,15 +245,25 @@ namespace Handbrake.Functions #endregion - - // Picture Settings Tab #region Picture - mainWindow.drp_crop.SelectedIndex = 1; - mainWindow.text_top.Text = presetQuery.CropTop; - mainWindow.text_bottom.Text = presetQuery.CropBottom; - mainWindow.text_left.Text = presetQuery.CropLeft; - mainWindow.text_right.Text = presetQuery.CropRight; + + if (presetQuery.CropTop == "0" && presetQuery.CropBottom == "0" && presetQuery.CropLeft == "0" && presetQuery.CropRight == "0") + { + mainWindow.drp_crop.SelectedIndex = 2; + } + else if (presetQuery.CropTop != null && presetQuery.CropBottom != null && presetQuery.CropLeft != null && presetQuery.CropRight != null) + { + mainWindow.drp_crop.SelectedIndex = 1; + 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.drp_crop.SelectedIndex = 0; + } mainWindow.drp_deInterlace_option.Text = presetQuery.DeInterlace; mainWindow.drp_deNoise.Text = presetQuery.DeNoise; -- cgit v1.2.3