diff options
| author | sr55 <[email protected]> | 2013-08-23 13:20:38 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2013-08-23 13:20:38 +0000 |
| commit | c7dc884bbee9c87fb4e7eb974d5ee029f4c234e4 (patch) | |
| tree | 9775daec15adcc3c39b957e9dd37e858b5a2cbf1 /win/CS/HandBrakeWPF/Converters | |
| parent | 1270ebc49fc8dc11ea509815094faacfa8338834 (diff) | |
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
Diffstat (limited to 'win/CS/HandBrakeWPF/Converters')
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs | 8 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs | 8 |
2 files changed, 8 insertions, 8 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))
{
diff --git a/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs b/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs index f44e18a3e..8cd29431f 100644 --- a/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/InverseBooleanConverter.cs @@ -19,10 +19,6 @@ namespace HandBrakeWPF.Converters [ValueConversion(typeof(bool), typeof(bool))]
public class InverseBooleanConverter : IValueConverter
{
- #region Implemented Interfaces
-
- #region IValueConverter
-
/// <summary>
/// The convert.
/// </summary>
@@ -73,9 +69,5 @@ namespace HandBrakeWPF.Converters {
throw new NotSupportedException();
}
-
- #endregion
-
- #endregion
}
}
\ No newline at end of file |