From c2e95c24c18e69ddb849f20f70c8fd7275381bd8 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 7 Dec 2013 20:17:31 +0000 Subject: WinGui: Remove needless QSV checkbox to enable QSV in options. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5924 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Converters/Video/VideoEncoderConverter.cs | 8 +------ .../HandBrakeWPF/Properties/Resources.Designer.cs | 10 -------- win/CS/HandBrakeWPF/Properties/Resources.resx | 4 ---- win/CS/HandBrakeWPF/UserSettingConstants.cs | 5 ---- win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs | 27 ---------------------- win/CS/HandBrakeWPF/Views/OptionsView.xaml | 25 ++++---------------- 6 files changed, 6 insertions(+), 73 deletions(-) diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs index 2dd2e82d8..8e2f1d379 100644 --- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs +++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs @@ -15,16 +15,11 @@ namespace HandBrakeWPF.Converters.Video using System.Linq; using System.Windows.Data; - using Caliburn.Micro; - using HandBrake.ApplicationServices.Model; using HandBrake.ApplicationServices.Model.Encoding; - using HandBrake.ApplicationServices.Services.Interfaces; using HandBrake.ApplicationServices.Utilities; using HandBrake.Interop.Model.Encoding; - using HandBrakeWPF.Services.Interfaces; - /// /// Video Encoder Converter /// @@ -60,8 +55,7 @@ namespace HandBrakeWPF.Converters.Video encoders.Remove(VideoEncoder.Theora); } - IUserSettingService userSettingService = IoC.Get(); - if (!SystemInfo.IsQsvAvailable || !userSettingService.GetUserSetting(UserSettingConstants.EnableQuickSync)) + if (!SystemInfo.IsQsvAvailable) { encoders.Remove(VideoEncoder.QuickSync); } diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index c81c09579..61a0bfebc 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -337,16 +337,6 @@ namespace HandBrakeWPF.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap logo64 { - get { - object obj = ResourceManager.GetObject("logo64", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized string similar to The Built-in presets have been reset.. /// diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index 085633458..9bcd3fac3 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -233,10 +233,6 @@ Baseline profile, as required for iPods and similar devices, requires weighted P Note that some devices and players, even those that support Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is completely incompatible with it, for example. - - - ..\Resources\logo64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - The full x264 list of parameters: {0} diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs index 9f8c69b53..5ef1d70dc 100644 --- a/win/CS/HandBrakeWPF/UserSettingConstants.cs +++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs @@ -241,11 +241,6 @@ namespace HandBrakeWPF /// public const string ResetWhenDoneAction = "ResetWhenDoneAction"; - /// - /// The enable quick sync. - /// - public const string EnableQuickSync = "EnableQuickSync"; - /// /// The add foreign audio scan track. /// diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index dde54a5c6..e0fdee4e2 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -374,11 +374,6 @@ namespace HandBrakeWPF.ViewModels /// private bool disableQuickSyncDecoding; - /// - /// The enable quick sync. - /// - private bool enableQuickSync; - /// /// The add foreign audio scan track. /// @@ -1438,26 +1433,6 @@ namespace HandBrakeWPF.ViewModels #region Video - /// - /// Gets or sets a value indicating whether enable quick sync. - /// - public bool EnableQuickSync - { - get - { - return this.enableQuickSync && this.IsQuickSyncAvailable; - } - set - { - if (value.Equals(this.enableQuickSync)) - { - return; - } - this.enableQuickSync = value; - this.NotifyOfPropertyChange(() => this.EnableQuickSync); - } - } - /// /// Gets or sets a value indicating whether disable quick sync decoding. /// @@ -1910,7 +1885,6 @@ namespace HandBrakeWPF.ViewModels // ############################# // Video // ############################# - this.EnableQuickSync = this.userSettingService.GetUserSetting(UserSettingConstants.EnableQuickSync); this.DisableQuickSyncDecoding = this.userSettingService.GetUserSetting(UserSettingConstants.DisableQuickSyncDecoding); this.EnableDxvaDecoding = this.userSettingService.GetUserSetting(UserSettingConstants.EnableDxva); this.SelectedScalingMode = this.userSettingService.GetUserSetting(UserSettingConstants.ScalingMode); @@ -2034,7 +2008,6 @@ namespace HandBrakeWPF.ViewModels this.userSettingService.SetUserSetting(UserSettingConstants.AddForeignAudioScanTrack, this.AddForeignAudioScanTrack); /* Video */ - this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSync, this.EnableQuickSync); this.userSettingService.SetUserSetting(UserSettingConstants.DisableQuickSyncDecoding, this.DisableQuickSyncDecoding); this.userSettingService.SetUserSetting(UserSettingConstants.EnableDxva, this.EnableDxvaDecoding); this.userSettingService.SetUserSetting(UserSettingConstants.ScalingMode, this.SelectedScalingMode); diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 87bdf42c4..961d31582 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -320,14 +320,16 @@ + - - + + + - @@ -340,23 +342,6 @@ - - - - - - - - - - - - - - - - -- cgit v1.2.3