Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Address CR from Thoys and David.

Browse source
This commit is contained in:
Kasen IO 2020-06-06 18:35:02 -04:00
parent e6505baf9d
commit b74ccef418
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/html/tabletHelp.html
View file

@ -77,9 +77,9 @@
var handControllerImageURL = null; var handControllerImageURL = null;
var index = 0; var index = 0;
var count = 3; var count = 3;
var handControllerRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#vr-controls"; var handControllerRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#vr-controls";
var keyboardRefURL = "https://docs.vircadia.com/explore/get-started/desktop.html#movement-controls"; var keyboardRefURL = "https://docs.vircadia.dev/explore/get-started/desktop.html#movement-controls";
var gamepadRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#gamepad"; var gamepadRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#gamepad";
function showKbm() { function showKbm() {
document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg"); document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");

3
interface/src/Application.cpp
View file

@ -3788,8 +3788,7 @@ void Application::setPreferredCursor(const QString& cursorName) {
if (_displayPlugin && _displayPlugin->isHmd()) { if (_displayPlugin && _displayPlugin->isHmd()) {
_preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName); _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
} } else {
else {
_preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
} }

4
interface/src/Menu.cpp
View file

@ -782,7 +782,7 @@ Menu::Menu() {
// Help/Application menu ---------------------------------- // Help/Application menu ----------------------------------
MenuWrapper * helpMenu = addMenu("Help"); MenuWrapper * helpMenu = addMenu("Help");
// Help > About Vircadiaa // Help > About Vircadia
action = addActionToQMenuAndActionHash(helpMenu, "About Vircadia"); action = addActionToQMenuAndActionHash(helpMenu, "About Vircadia");
connect(action, &QAction::triggered, [] { connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"), qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
@ -793,7 +793,7 @@ Menu::Menu() {
// Help > Vircadia Docs // Help > Vircadia Docs
action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation"); action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
connect(action, &QAction::triggered, qApp, [] { connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://apidocs.vircadia.dev/")); QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/"));
}); });
// Help > Vircadia Forum // Help > Vircadia Forum