Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539

MS9539: Update Controls Reference pages

interface/resources/html/tabletHelp.html

@@ -66,7 +66,7 @@
         <script>
             var handControllerImageURL = null;
             var index = 0;
-            var count = 4;
+            var count = 5;
 
             function showKbm() {
                 document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
@@ -102,9 +102,13 @@
                         showHandControllers();
                         break;
                     case 2:
-                        showGamepad();
+                        handControllerImageURL = "img/tablet-help-windowsMR.jpg";
+                        showHandControllers();
                         break;
                     case 3:
+                        showGamepad();
+                        break;
+                    case 4:
                         showKbm();
                         break;
 
@@ -144,7 +148,10 @@
                         handControllerImageURL = "img/tablet-help-oculus.jpg";
                         index = 0;
                         break;
-
+                    case "windowsMR":
+                        handControllerImageURL = "img/tablet-help-windowsMR.jpg";
+                        index = 2;
+                        break;
                     case "vive":
                     default:
                         handControllerImageURL = "img/tablet-help-vive.jpg";
@@ -154,7 +161,7 @@
                 switch (params.defaultTab) {
                     case "gamepad":
                         showGamepad();
-                        index = 2;
+                        index = 3;
                         break;
 
                     case "handControllers":
@@ -164,7 +171,7 @@
                     case "kbm":
                     default:
                         showKbm();
-                        index = 3;
+                        index = 4;
                 }
             }
         </script>

interface/src/Application.cpp

@@ -3220,6 +3220,7 @@ void Application::setSettingConstrainToolbarPosition(bool setting) {
 void Application::showHelp() {
     static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
     static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
+    static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR";
 
     static const QString TAB_KEYBOARD_MOUSE = "kbm";
     static const QString TAB_GAMEPAD = "gamepad";
@@ -3234,9 +3235,13 @@ void Application::showHelp() {
     } else if (PluginUtils::isOculusTouchControllerAvailable()) {
         defaultTab = TAB_HAND_CONTROLLERS;
         handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
+    } else if (qApp->getActiveDisplayPlugin()->getName() == "WindowMS") {
+        defaultTab = TAB_HAND_CONTROLLERS;
+        handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR;
     } else if (PluginUtils::isXboxControllerAvailable()) {
         defaultTab = TAB_GAMEPAD;
     }
+    // TODO need some way to detect windowsMR to load controls reference default tab in Help > Controls Reference menu.
 
     QUrlQuery queryString;
     queryString.addQueryItem("handControllerName", handControllerName);