From 8bccfabca28d059978f1eb8e516592f4e2f06c1a Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 21 Sep 2013 17:54:33 +0000 Subject: WinGui: Remove now unneeded debug menu git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5791 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- .../Commands/ProcessShortcutCommand.cs | 5 +++++ win/CS/HandBrakeWPF/UserSettingConstants.cs | 5 ----- .../ViewModels/Interfaces/IMainViewModel.cs | 5 +++++ win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 11 ---------- win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs | 25 +--------------------- win/CS/HandBrakeWPF/Views/MainView.xaml | 4 ---- win/CS/HandBrakeWPF/Views/OptionsView.xaml | 1 - win/CS/HandBrakeWPF/Views/ShellView.xaml.cs | 2 ++ win/CS/HandBrakeWPF/defaultsettings.xml | 8 ------- 9 files changed, 13 insertions(+), 53 deletions(-) diff --git a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs index cc5b546a2..636c424e6 100644 --- a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs +++ b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs @@ -88,6 +88,11 @@ namespace HandBrakeWPF.Commands { mainViewModel.FolderScan(); } + + if (gesture.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && gesture.Key == Key.D) + { + mainViewModel.ShowCliQuery(); + } } } diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs index be18e755f..e841005b2 100644 --- a/win/CS/HandBrakeWPF/UserSettingConstants.cs +++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs @@ -151,11 +151,6 @@ namespace HandBrakeWPF /// public const string ServerPort = "ServerPort"; - /// - /// Enable Debugging features within the GUI. - /// - public const string EnableDebugFeatures = "EnableDebugFeatures"; - /// /// Enable the use of LibHb instead of HandBrakeCLI /// diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs index 67dcf4c09..0d176b7b7 100644 --- a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs @@ -84,5 +84,10 @@ namespace HandBrakeWPF.ViewModels.Interfaces /// Shutdown this View /// void Shutdown(); + + /// + /// The show cli query. + /// + void ShowCliQuery(); } } \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index de6d7c063..819609f20 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -626,17 +626,6 @@ namespace HandBrakeWPF.ViewModels } } - /// - /// Gets a value indicating whether show debug menu. - /// - public bool ShowDebugMenu - { - get - { - return this.userSettingService.GetUserSetting(UserSettingConstants.EnableDebugFeatures); - } - } - /// /// Gets or sets the cancel scan command. /// diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs index 79d5f5675..1ad006447 100644 --- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs @@ -333,11 +333,6 @@ namespace HandBrakeWPF.ViewModels /// private int serverPort; - /// - /// The server port. - /// - private bool enableDebugFeatures; - /// /// Backing field for EnableLibHb /// @@ -1361,22 +1356,6 @@ namespace HandBrakeWPF.ViewModels } } - /// - /// Gets or sets a value indicating whether debug features are enabled. - /// - public bool EnableDebugFeatures - { - get - { - return this.enableDebugFeatures; - } - set - { - this.enableDebugFeatures = value; - this.NotifyOfPropertyChange(() => this.EnableDebugFeatures); - } - } - /// /// Gets or sets a value indicating whether enable lib hb. /// @@ -1709,7 +1688,6 @@ namespace HandBrakeWPF.ViewModels int.TryParse(userSettingService.GetUserSetting(UserSettingConstants.ServerPort), out port); this.ServerPort = port; this.EnableProcessIsolation = userSettingService.GetUserSetting(UserSettingConstants.EnableProcessIsolation); - this.EnableDebugFeatures = userSettingService.GetUserSetting(UserSettingConstants.EnableDebugFeatures); this.EnableLibHb = userSettingService.GetUserSetting(UserSettingConstants.EnableLibHb); } @@ -1928,8 +1906,7 @@ namespace HandBrakeWPF.ViewModels userSettingService.SetUserSetting(ASUserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav); userSettingService.SetUserSetting(UserSettingConstants.EnableProcessIsolation, this.EnableProcessIsolation); - userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString()); - userSettingService.SetUserSetting(UserSettingConstants.EnableDebugFeatures, this.EnableDebugFeatures); + userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString(CultureInfo.InvariantCulture)); userSettingService.SetUserSetting(UserSettingConstants.EnableLibHb, this.EnableLibHb); } diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml index 4f7ab8ce0..8c6d01877 100644 --- a/win/CS/HandBrakeWPF/Views/MainView.xaml +++ b/win/CS/HandBrakeWPF/Views/MainView.xaml @@ -177,10 +177,6 @@ - - - - diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml index 39282a062..22058e0fb 100644 --- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml +++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml @@ -392,7 +392,6 @@ - diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs index 067446f12..0347bc647 100644 --- a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs +++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs @@ -68,6 +68,7 @@ namespace HandBrakeWPF.Views // Add to Queue (Ctrl+A) // Scan a File (Ctrl+F) // Scan a Folder (Ctrl+R) + // Show CLI Query (Ctrl+Shift+D) this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.S, ModifierKeys.Control)), new KeyGesture(Key.S, ModifierKeys.Control))); this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.K, ModifierKeys.Control)), new KeyGesture(Key.K, ModifierKeys.Control))); @@ -76,6 +77,7 @@ namespace HandBrakeWPF.Views this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.A, ModifierKeys.Control)), new KeyGesture(Key.A, ModifierKeys.Control))); this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.F, ModifierKeys.Control)), new KeyGesture(Key.F, ModifierKeys.Control))); this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.R, ModifierKeys.Control)), new KeyGesture(Key.R, ModifierKeys.Control))); + this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift))); // Enable Windows 7 Taskbar progress indication. if (this.TaskbarItemInfo == null) diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml index 6ee45940f..7ce82ef26 100644 --- a/win/CS/HandBrakeWPF/defaultsettings.xml +++ b/win/CS/HandBrakeWPF/defaultsettings.xml @@ -408,14 +408,6 @@ false - - - EnableDebugFeatures - - - false - - EnableLibHb -- cgit v1.2.3