From: sr55 Date: Fri, 2 Nov 2018 22:36:31 +0000 (+0000) Subject: WinGui: Limit the experimental features to the nightly builds. X-Git-Tag: 1.2.0~96 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=434d5ddedc06616d6d426f13a4b3224c50109d75;p=handbrake WinGui: Limit the experimental features to the nightly builds. --- diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 7cd66fb76..9cfe574ca 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -23,6 +23,7 @@ namespace HandBrakeWPF.ViewModels using Caliburn.Micro; using HandBrake.Interop.Interop; + using HandBrake.Interop.Utilities; using HandBrakeWPF.Commands; using HandBrakeWPF.Commands.Menu; @@ -1401,8 +1402,8 @@ namespace HandBrakeWPF.ViewModels /// public void OpenQueueWindow() { - bool showQueueInline = this.userSettingService.GetUserSetting(UserSettingConstants.ShowQueueInline); - bool showNewQueue = this.userSettingService.GetUserSetting(UserSettingConstants.ShowExperimentalQueue); ; + bool showQueueInline = this.userSettingService.GetUserSetting(UserSettingConstants.ShowQueueInline) && VersionHelper.IsNightly(); + bool showNewQueue = this.userSettingService.GetUserSetting(UserSettingConstants.ShowExperimentalQueue) && VersionHelper.IsNightly(); this.QueueViewModel.IsNewQueueVisible = showNewQueue; this.QueueViewModel.IsInline = showQueueInline; diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 36034f0d2..f5685d311 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -172,6 +172,14 @@ namespace HandBrakeWPF.ViewModels } } + public bool IsNightly + { + get + { + return VersionHelper.IsNightly(); + } + } + #region General /// diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index ae403147b..bde4b7303 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -177,7 +177,7 @@ - +