History

Merge branch 'master' of https://github.com/highfidelity/hifi into pal-proto

howard-stearns committed 9 years ago

Commit 6fc27ac2 parents 7c92ad5 f905acf53 files · +1887 −139Browse files

Showing the changes to interface/src/Application.cpp (1 of 53 files). Show all

Unified · Split

interface/src/Application.cpp+20−6
@@ -2214,17 +2214,31 @@ void Application::aboutApp() { · 2213 unmodified lines
22142214 }
22152215
22162216 void Application::showHelp() {
2217− static const QString QUERY_STRING_XBOX = "xbox";
2218− static const QString QUERY_STRING_VIVE = "vive";
2217+ static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
2218+ static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
2219+
2220+ static const QString TAB_KEYBOARD_MOUSE = "kbm";
2221+ static const QString TAB_GAMEPAD = "gamepad";
2222+ static const QString TAB_HAND_CONTROLLERS = "handControllers";
2223+
2224+ QString handControllerName = HAND_CONTROLLER_NAME_VIVE;
2225+ QString defaultTab = TAB_KEYBOARD_MOUSE;
22192226
2220− QString queryString = "";
22212227 if (PluginUtils::isViveControllerAvailable()) {
2222− queryString = QUERY_STRING_VIVE;
2228+ defaultTab = TAB_HAND_CONTROLLERS;
2229+ handControllerName = HAND_CONTROLLER_NAME_VIVE;
2230+ } else if (PluginUtils::isOculusTouchControllerAvailable()) {
2231+ defaultTab = TAB_HAND_CONTROLLERS;
2232+ handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
22232233 } else if (PluginUtils::isXboxControllerAvailable()) {
2224− queryString = QUERY_STRING_XBOX;
2234+ defaultTab = TAB_GAMEPAD;
22252235 }
22262236
2227− InfoView::show(INFO_HELP_PATH, false, queryString);
2237+ QUrlQuery queryString;
2238+ queryString.addQueryItem("handControllerName", handControllerName);
2239+ queryString.addQueryItem("defaultTab", defaultTab);
2240+
2241+ InfoView::show(INFO_HELP_PATH, false, queryString.toString());
22282242 }
22292243
22302244 void Application::resizeEvent(QResizeEvent* event) {