Moved all shortcuts over to ProHome

Author: Yair Aichenbaum

Files/App.xaml.cs

@@ -208,36 +208,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
                 // Ensure the current window is active
                 Window.Current.Activate();
                 Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
-                Window.Current.CoreWindow.Dispatcher.AcceleratorKeyActivated += Dispatcher_AcceleratorKeyActivated;
-
-            }
-        }
-
-        private void Dispatcher_AcceleratorKeyActivated(CoreDispatcher sender, AcceleratorKeyEventArgs args)
-        {
-            if (args.KeyStatus.IsMenuKeyDown)
-            {
-                switch (args.VirtualKey)
-                {
-                    case VirtualKey.Left:
-                        NavigationActions.Back_Click(null, null);
-                        break;
-                    case VirtualKey.Right:
-                        NavigationActions.Forward_Click(null, null);
-                        break;
-                    case VirtualKey.F:
-                        (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 0;
-                        break;
-                    case VirtualKey.H:
-                        (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 1;
-                        break;
-                    case VirtualKey.S:
-                        (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 2;
-                        break;
-                    case VirtualKey.V:
-                        (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 3;
-                        break;
-                }
             }
         }
 
@@ -268,7 +238,6 @@ protected override void OnActivated(IActivatedEventArgs args)
                     // Ensure the current window is active.
                     Window.Current.Activate();
                     Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
-                    Window.Current.CoreWindow.Dispatcher.AcceleratorKeyActivated += Dispatcher_AcceleratorKeyActivated;
                     return;
 
                 case ActivationKind.CommandLineLaunch:
@@ -293,15 +262,12 @@ protected override void OnActivated(IActivatedEventArgs args)
                                     // Ensure the current window is active.
                                     Window.Current.Activate();
                                     Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
-                                    Window.Current.CoreWindow.Dispatcher.AcceleratorKeyActivated += Dispatcher_AcceleratorKeyActivated;
-
                                     return;
                                 case ParsedCommandType.Unkwon:
                                     rootFrame.Navigate(typeof(InstanceTabsView), null, new SuppressNavigationTransitionInfo());
                                     // Ensure the current window is active.
                                     Window.Current.Activate();
                                     Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
-                                    Window.Current.CoreWindow.Dispatcher.AcceleratorKeyActivated += Dispatcher_AcceleratorKeyActivated;
                                     return;
                             }
                         }
@@ -314,7 +280,6 @@ protected override void OnActivated(IActivatedEventArgs args)
             // Ensure the current window is active.
             Window.Current.Activate();
             Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
-            Window.Current.CoreWindow.Dispatcher.AcceleratorKeyActivated += Dispatcher_AcceleratorKeyActivated;
         }
 
         private void TryEnablePrelaunch()

Files/ProHome.xaml.cs

@@ -319,8 +319,27 @@ private async void ProHomeInstance_KeyUp(object sender, KeyRoutedEventArgs e)
                         App.CurrentInstance.InteractionOperations.ToggleQuickLook();
                     }
                     break;
+                case (false, false, true, true, VirtualKey.Left):
+                    NavigationActions.Back_Click(null, null);
+                    break;
+                case (false, false, true, true, VirtualKey.Right):
+                    NavigationActions.Forward_Click(null, null);
+                    break;
+                case (false, false, true, true, VirtualKey.F):
+                    (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 0;
+                    break;
+                case (false, false, true, true, VirtualKey.H):
+                    (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 1;
+                    break;
+                case (false, false, true, true, VirtualKey.S):
+                    (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 2;
+                    break;
+                case (false, false, true, true, VirtualKey.V):
+                    (App.CurrentInstance.OperationsControl as RibbonArea).RibbonTabView.SelectedIndex = 3;
+                    break;
             };
 
+
             if (App.CurrentInstance.CurrentPageType == typeof(PhotoAlbum))
             {
                 switch (e.Key)