WinGui: Remove now unneeded debug menu

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

diff --git a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
index cc5b546a23fec155d85fa85e3e1494531e9945af..636c424e6cb6806d99eeb423431eac2f974b80ee 100644 (file)
--- a/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
+++ b/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs
@@ -88,6 +88,11 @@ namespace HandBrakeWPF.Commands
                 {\r
                     mainViewModel.FolderScan();\r
                 }\r
+\r
+                if (gesture.Modifiers == (ModifierKeys.Control | ModifierKeys.Shift) && gesture.Key == Key.D)\r
+                {\r
+                    mainViewModel.ShowCliQuery();\r
+                }\r
             }\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/UserSettingConstants.cs b/win/CS/HandBrakeWPF/UserSettingConstants.cs
index be18e755f7f551fc3ca03eb7319d9925a3fa39ae..e841005b2412d18d21e05e20c9e628de4129817f 100644 (file)
--- a/win/CS/HandBrakeWPF/UserSettingConstants.cs
+++ b/win/CS/HandBrakeWPF/UserSettingConstants.cs
@@ -151,11 +151,6 @@ namespace HandBrakeWPF
         /// </summary>\r
         public const string ServerPort = "ServerPort";\r
 \r
-        /// <summary>\r
-        /// Enable Debugging features within the GUI.\r
-        /// </summary>\r
-        public const string EnableDebugFeatures = "EnableDebugFeatures";\r
-\r
         /// <summary>\r
         /// Enable the use of LibHb instead of HandBrakeCLI\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs
index 67dcf4c0930aceba30468c4a26ca097b13c2079e..0d176b7b7b33ec8dbd0f069cf09b6ca94185d21e 100644 (file)
--- 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\r
         /// </summary>\r
         void Shutdown();\r
+\r
+        /// <summary>\r
+        /// The show cli query.\r
+        /// </summary>\r
+        void ShowCliQuery();\r
     }\r
 }
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index de6d7c06323e49e9ec15588d30d933ad7f588153..819609f201125ffd25caf82492d63f9e4c26e077 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -626,17 +626,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets a value indicating whether show debug menu.\r
-        /// </summary>\r
-        public bool ShowDebugMenu\r
-        {\r
-            get\r
-            {\r
-                return this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDebugFeatures);\r
-            }\r
-        }\r
-\r
         /// <summary>\r
         /// Gets or sets the cancel scan command.\r
         /// </summary>\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
index 79d5f5675e0b98148bfa07c0d251442ebb1e23cb..1ad0064471c9ff1334100baaa478be7a789659dc 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs
@@ -333,11 +333,6 @@ namespace HandBrakeWPF.ViewModels
         /// </summary>\r
         private int serverPort;\r
 \r
-        /// <summary>\r
-        /// The server port.\r
-        /// </summary>\r
-        private bool enableDebugFeatures;\r
-\r
         /// <summary>\r
         /// Backing field for EnableLibHb\r
         /// </summary>\r
@@ -1361,22 +1356,6 @@ namespace HandBrakeWPF.ViewModels
             }\r
         }\r
 \r
-        /// <summary>\r
-        /// Gets or sets a value indicating whether debug features are enabled.\r
-        /// </summary>\r
-        public bool EnableDebugFeatures\r
-        {\r
-            get\r
-            {\r
-                return this.enableDebugFeatures;\r
-            }\r
-            set\r
-            {\r
-                this.enableDebugFeatures = value;\r
-                this.NotifyOfPropertyChange(() => this.EnableDebugFeatures);\r
-            }\r
-        }\r
-\r
         /// <summary>\r
         /// Gets or sets a value indicating whether enable lib hb.\r
         /// </summary>\r
@@ -1709,7 +1688,6 @@ namespace HandBrakeWPF.ViewModels
             int.TryParse(userSettingService.GetUserSetting<string>(UserSettingConstants.ServerPort), out port);\r
             this.ServerPort = port;\r
             this.EnableProcessIsolation = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableProcessIsolation);\r
-            this.EnableDebugFeatures = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableDebugFeatures);\r
             this.EnableLibHb = userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableLibHb);\r
         }\r
 \r
@@ -1928,8 +1906,7 @@ namespace HandBrakeWPF.ViewModels
 \r
             userSettingService.SetUserSetting(ASUserSettingConstants.DisableLibDvdNav, this.DisableLibdvdNav);\r
             userSettingService.SetUserSetting(UserSettingConstants.EnableProcessIsolation, this.EnableProcessIsolation);\r
-            userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString());\r
-            userSettingService.SetUserSetting(UserSettingConstants.EnableDebugFeatures, this.EnableDebugFeatures);\r
+            userSettingService.SetUserSetting(UserSettingConstants.ServerPort, this.ServerPort.ToString(CultureInfo.InvariantCulture));\r
             userSettingService.SetUserSetting(UserSettingConstants.EnableLibHb, this.EnableLibHb);\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index 4f7ab8ce0d0609ac4081b74d403e6729b4179fea..8c6d0187712f0dc68fa4c1e73bb86131897eae76 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -177,10 +177,6 @@
                     <Separator />\r
                     <MenuItem Header="_About..." Micro:Message.Attach="[Event Click] = [Action OpenAboutApplication]" />\r
                 </MenuItem>\r
-\r
-                <MenuItem Header="_Debug" Visibility="{Binding ShowDebugMenu, Converter={StaticResource boolToVisConverter}}" >\r
-                    <MenuItem Header="_Show CLI Equiv" Micro:Message.Attach="[Event Click] = [Action ShowCliQuery]" />\r
-                </MenuItem>\r
             </Menu>\r
 \r
             <!--  ToolBar  -->\r

diff --git a/win/CS/HandBrakeWPF/Views/OptionsView.xaml b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
index 39282a062f8d0f091a7acfa87c8a9ec86097819c..22058e0fb862ee85ac3eee5938e505c1408c603f 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/OptionsView.xaml
+++ b/win/CS/HandBrakeWPF/Views/OptionsView.xaml
@@ -392,7 +392,6 @@
                                 <TextBox Width="50" MaxLength="5" Text="{Binding ServerPort}" />\r
                             </StackPanel>\r
 \r
-                            <CheckBox Content="Enable Debug Features" IsChecked="{Binding EnableDebugFeatures}" Margin="0,10,0,0" />\r
                         </StackPanel>\r
                     </StackPanel>\r
                 </StackPanel>\r

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
index 067446f12ded4d81b6c7d8a5322ee0897d04d4f6..0347bc64766861a4a9d287f64224577c721d505c 100644 (file)
--- 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)\r
             // Scan a File (Ctrl+F)\r
             // Scan a Folder (Ctrl+R)\r
+            // Show CLI Query (Ctrl+Shift+D)\r
 \r
             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.S, ModifierKeys.Control)), new KeyGesture(Key.S, ModifierKeys.Control)));\r
             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.K, ModifierKeys.Control)), new KeyGesture(Key.K, ModifierKeys.Control)));\r
@@ -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)));\r
             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.F, ModifierKeys.Control)), new KeyGesture(Key.F, ModifierKeys.Control)));\r
             this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.R, ModifierKeys.Control)), new KeyGesture(Key.R, ModifierKeys.Control)));\r
+            this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift)));\r
 \r
             // Enable Windows 7 Taskbar progress indication.\r
             if (this.TaskbarItemInfo == null)\r

diff --git a/win/CS/HandBrakeWPF/defaultsettings.xml b/win/CS/HandBrakeWPF/defaultsettings.xml
index 6ee45940f01ab75b2e341f4328ad124a07fa4eec..7ce82ef26a7a284305bea160bf146b8a26ae1339 100644 (file)
--- a/win/CS/HandBrakeWPF/defaultsettings.xml
+++ b/win/CS/HandBrakeWPF/defaultsettings.xml
@@ -408,14 +408,6 @@
       <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r
     </value>\r
   </item>\r
-  <item>\r
-    <key>\r
-      <string>EnableDebugFeatures</string>\r
-    </key>\r
-    <value>\r
-      <anyType xmlns:q1="http://www.w3.org/2001/XMLSchema" d4p1:type="q1:boolean" xmlns:d4p1="http://www.w3.org/2001/XMLSchema-instance">false</anyType>\r
-    </value>\r
-  </item>\r
   <item>\r
     <key>\r
       <string>EnableLibHb</string>\r