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 7cd66fb764b09b85d0d9578823d43d1e2ff95c92..9cfe574ca9262c036e8ea7f05277f05e78f66019 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -23,6 +23,7 @@ namespace HandBrakeWPF.ViewModels
     using Caliburn.Micro;\r
 \r
     using HandBrake.Interop.Interop;\r
+    using HandBrake.Interop.Utilities;\r
 \r
     using HandBrakeWPF.Commands;\r
     using HandBrakeWPF.Commands.Menu;\r
@@ -1401,8 +1402,8 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         public void OpenQueueWindow()\r
         {\r
-            bool showQueueInline = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowQueueInline);\r
-            bool showNewQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowExperimentalQueue); ;\r
+            bool showQueueInline = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowQueueInline) && VersionHelper.IsNightly();\r
+            bool showNewQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowExperimentalQueue) && VersionHelper.IsNightly();\r
 \r
             this.QueueViewModel.IsNewQueueVisible = showNewQueue;\r
             this.QueueViewModel.IsInline = showQueueInline;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 36034f0d27d1763d0b5e4de0095c1c5c27b40a37..f5685d311a7d96c9baa8b5c351e7cf4df3ca4bfc 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -172,6 +172,14 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
+        public bool IsNightly\r
+        {\r
+            get\r
+            {\r
+                return VersionHelper.IsNightly();\r
+            }\r
+        }\r
+\r
         #region General\r
 \r
         /// <summary>\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index ae403147be51d1cd7c2c7808ae49651f3ad1f716..bde4b730306dff2dab578efa20cbe747ab5034f5 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -177,7 +177,7 @@
                         </StackPanel>\r
                     </StackPanel>\r
 \r
-                    <StackPanel Orientation="Vertical" Margin="0,0,0,20">\r
+                    <StackPanel Orientation="Vertical" Margin="0,0,0,20" Visibility="{Binding IsNightly, Converter={StaticResource boolToVisConverter}}">\r
 \r
                         <TextBlock Text="{x:Static Properties:Resources.Options_Experimental}" FontSize="14" Margin="0,0,0,10"/>\r
 \r