From b74ccef418aaf471c6c01772a5847b0e318ae4d3 Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Sat, 6 Jun 2020 18:35:02 -0400
Subject: [PATCH] Address CR from Thoys and David.
---
interface/resources/html/tabletHelp.html | 6 +++---
interface/src/Application.cpp | 3 +--
interface/src/Menu.cpp | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html
index b67b0c4689..17b41a1979 100644
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@@ -77,9 +77,9 @@
var handControllerImageURL = null;
var index = 0;
var count = 3;
- var handControllerRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#vr-controls";
- var keyboardRefURL = "https://docs.vircadia.com/explore/get-started/desktop.html#movement-controls";
- var gamepadRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#gamepad";
+ var handControllerRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#vr-controls";
+ var keyboardRefURL = "https://docs.vircadia.dev/explore/get-started/desktop.html#movement-controls";
+ var gamepadRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#gamepad";
function showKbm() {
document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e68e3a2de1..611ba19e0b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3788,8 +3788,7 @@ void Application::setPreferredCursor(const QString& cursorName) {
if (_displayPlugin && _displayPlugin->isHmd()) {
_preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
- }
- else {
+ } else {
_preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
}
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index bc095b3beb..f9dd3fb468 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -782,7 +782,7 @@ Menu::Menu() {
// Help/Application menu ----------------------------------
MenuWrapper * helpMenu = addMenu("Help");
- // Help > About Vircadiaa
+ // Help > About Vircadia
action = addActionToQMenuAndActionHash(helpMenu, "About Vircadia");
connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
@@ -793,7 +793,7 @@ Menu::Menu() {
// Help > Vircadia Docs
action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
connect(action, &QAction::triggered, qApp, [] {
- QDesktopServices::openUrl(QUrl("https://apidocs.vircadia.dev/"));
+ QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/"));
});
// Help > Vircadia Forum