Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 00:25:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item

Browse source 
Add Help > Tutorial menu item
This commit is contained in:
kasenvr 2020-07-02 17:10:38 -04:00 committed by GitHub
commit b7b902b755
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -3857,6 +3857,11 @@ void Application::showHelp() {
//InfoView::show(INFO_HELP_PATH, false, queryString.toString()); //InfoView::show(INFO_HELP_PATH, false, queryString.toString());
} }
void Application::gotoTutorial() {
const QString TUTORIAL_ADDRESS = "file:///~/serverless/tutorial.json";
DependencyManager::get<AddressManager>()->handleLookupString(TUTORIAL_ADDRESS);
}
void Application::resizeEvent(QResizeEvent* event) { void Application::resizeEvent(QResizeEvent* event) {
resizeGL(); resizeGL();
} }

1
interface/src/Application.h
View file

@ -425,6 +425,7 @@ public slots:
#endif #endif
static void showHelp(); static void showHelp();
static void gotoTutorial();
void cycleCamera(); void cycleCamera();
void cameraModeChanged(); void cameraModeChanged();

2
interface/src/Menu.cpp
View file

@ -816,6 +816,8 @@ Menu::Menu() {
addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp())); addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp()));
addActionToQMenuAndActionHash(helpMenu, "Tutorial", 0, qApp, SLOT(gotoTutorial()));
helpMenu->addSeparator(); helpMenu->addSeparator();
// Help > Release Notes // Help > Release Notes

5
libraries/networking/src/AddressManager.h
View file

@ -249,8 +249,9 @@ public slots:
* Takes you to a specified metaverse address. * Takes you to a specified metaverse address.
* @function location.handleLookupString * @function location.handleLookupString
* @param {string} address - The address to go to: a <code>"hifi://"</code> address, an IP address (e.g., * @param {string} address - The address to go to: a <code>"hifi://"</code> address, an IP address (e.g.,
* <code>"127.0.0.1"</code> or <code>"localhost"</code>), a domain name, a named path on a domain (starts with * <code>"127.0.0.1"</code> or <code>"localhost"</code>), a <code>file:///</code> address, a domain name, a named path
* <code>"/"</code>), a position or position and orientation, or a user (starts with <code>"@"</code>). * on a domain (starts with <code>"/"</code>), a position or position and orientation, or a user (starts with
* <code>"@"</code>).
* @param {boolean} [fromSuggestions=false] - Set to <code>true</code> if the address is obtained from the "Goto" dialog. * @param {boolean} [fromSuggestions=false] - Set to <code>true</code> if the address is obtained from the "Goto" dialog.
* Helps ensure that user's location history is correctly maintained. * Helps ensure that user's location history is correctly maintained.
*/ */