WinGui: Remove old ShowCLI setting. There isn't much reason to have this anymore.

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

4 files changed, 1 insertions, 32 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs b/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
index f9200958d..bd6a906ba 100644
--- a/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
+++ b/win/CS/HandBrake.ApplicationServices/ASUserSettingConstants.cs
@@ -50,11 +50,6 @@ namespace HandBrake.ApplicationServices
         public const string PreventSleep = "PreventSleep";

 

         /// <summary>

-        /// Show the CLI window

-        /// </summary>

-        public const string ShowCLI = "ShowCLI";

-

-        /// <summary>

         /// Save Log Directory

         /// </summary>

         public const string SaveLogToCopyDirectory = "SaveLogToCopyDirectory";

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Encode.cs b/win/CS/HandBrake.ApplicationServices/Services/Encode.cs
index 18457af85..0b0c23dbf 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Encode.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Encode.cs
@@ -146,7 +146,7 @@ namespace HandBrake.ApplicationServices.Services
                     RedirectStandardOutput = true,

                     RedirectStandardError = enableLogging ? true : false,

                     UseShellExecute = false,

-                    CreateNoWindow = !this.userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI) ? true : false

+                    CreateNoWindow = true

                 };

 

                 this.HbProcess = new Process { StartInfo = cliStart };

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 1bd773bc0..343d6be7c 100644
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -280,11 +280,6 @@ namespace HandBrakeWPF.ViewModels
         private string sendFileToPath;

 

         /// <summary>

-        /// The show cli window.

-        /// </summary>

-        private bool showCliWindow;

-

-        /// <summary>

         /// The vlc path.

         /// </summary>

         private string vlcPath;

@@ -1299,23 +1294,6 @@ namespace HandBrakeWPF.ViewModels
         }

 

         /// <summary>

-        /// Gets or sets a value indicating whether ShowCliWindow.

-        /// </summary>

-        public bool ShowCliWindow

-        {

-            get

-            {

-                return this.showCliWindow;

-            }

-

-            set

-            {

-                this.showCliWindow = value;

-                this.NotifyOfPropertyChange("ShowCliWindow");

-            }

-        }

-

-        /// <summary>

         /// Gets or sets a value indicating whether ClearQueueOnEncodeCompleted.

         /// </summary>

         public bool ClearQueueOnEncodeCompleted

@@ -1626,7 +1604,6 @@ namespace HandBrakeWPF.ViewModels
 

             // Priority level for encodes

             this.priorityLevelOptions.Clear();

-            this.priorityLevelOptions.Add("Realtime");

             this.priorityLevelOptions.Add("High");

             this.priorityLevelOptions.Add("Above Normal");

             this.priorityLevelOptions.Add("Normal");

@@ -1660,7 +1637,6 @@ namespace HandBrakeWPF.ViewModels
             this.DisplayStatusMessagesTrayIcon = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.TrayIconAlerts);

             this.MinimiseToTray = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.MainWindowMinimize);

             this.DisablePresetUpdateCheckNotification = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PresetNotification);

-            this.ShowCliWindow = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ShowCLI);

             this.ClearQueueOnEncodeCompleted = userSettingService.GetUserSetting<bool>(ASUserSettingConstants.ClearCompletedFromQueue);

 

             // Set the preview count

@@ -1894,7 +1870,6 @@ namespace HandBrakeWPF.ViewModels
             userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);

             userSettingService.SetUserSetting(UserSettingConstants.TrayIconAlerts, this.DisplayStatusMessagesTrayIcon);

             userSettingService.SetUserSetting(UserSettingConstants.PresetNotification, this.DisablePresetUpdateCheckNotification);

-            userSettingService.SetUserSetting(ASUserSettingConstants.ShowCLI, this.ShowCliWindow);

             userSettingService.SetUserSetting(ASUserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);

             userSettingService.SetUserSetting(ASUserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);

             userSettingService.SetUserSetting(ASUserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index a2be6c113..88f2fae61 100644
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -262,7 +262,6 @@
                             <CheckBox Content="Minimize to system tray (Requires Restart)" Visibility="Collapsed" IsChecked="{Binding MinimiseToTray}" />

                             <CheckBox Content="Display status messages from tray icon (balloon popups)"  Visibility="Collapsed"  IsChecked="{Binding DisplayStatusMessagesTrayIcon}" />

                             <CheckBox Content="Disable built-in preset update notification" IsChecked="{Binding DisablePresetUpdateCheckNotification}" />

-                            <CheckBox Content="Show CLI window (Allows you to cleanly exit encode with ctrl-c)" IsChecked="{Binding ShowCliWindow}" />

                             <CheckBox Content="Always clear completed queue items after an encode completes" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />

                             <StackPanel Orientation="Horizontal" Margin="0,10,0,0">

                                 <TextBlock Text="Number of picture previews to scan:" VerticalAlignment="Center" Width="250" />