WinGui: Manually merged the QuickSync UI changes from the qsv branch to trunk

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

1 files changed, 8 insertions, 0 deletions

diff --git a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
index 6f89bb52f..d65b7f9f1 100644
--- a/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs
@@ -65,6 +65,10 @@ namespace HandBrakeWPF.Converters
             {

                 return EnumHelper<Mixdown>.GetEnumDisplayValues(typeof(Mixdown));

             }

+            if (targetType == typeof(QsvPreset) || value.GetType() == typeof(QsvPreset))

+            {

+                return EnumHelper<QsvPreset>.GetDisplay((QsvPreset)value);

+            }

  

             if (value is IEnumerable<PresetPictureSettingsMode>)

             {

@@ -182,6 +186,10 @@ namespace HandBrakeWPF.Converters
             {

                 return EnumHelper<Mixdown>.GetValue(value.ToString());

             }

+            if (targetType == typeof(QsvPreset) || value.GetType() == typeof(QsvPreset))

+            {

+                return EnumHelper<QsvPreset>.GetValue(value.ToString());

+            }

 

             if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))

             {