Showing the changes to interface/src/Menu.cpp (1 of 98 files). Show all
Unified · Split
| @@ -285,9 +285,6 @@ Menu::Menu() : · 284 unmodified lines | ||
| 285 | 285 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true); |
| 286 | 286 | addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails())); |
| 287 | 287 | addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails())); |
| 288 | − addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::AudioScope, 0, false, | |
| 289 | − appInstance->getAudio(), | |
| 290 | − SLOT(toggleScope())); | |
| 291 | 288 | |
| 292 | 289 | QMenu* developerMenu = addMenu("Developer"); |
| 293 | 290 | |
| @@ -389,20 +386,6 @@ Menu::Menu() : · 95 unmodified lines | ||
| 389 | 386 | addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::PipelineWarnings); |
| 390 | 387 | addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::SuppressShortTimings); |
| 391 | 388 | |
| 392 | − addCheckableActionToQMenuAndActionHash(renderDebugMenu, | |
| 393 | − MenuOption::CullSharedFaces, | |
| 394 | − Qt::CTRL | Qt::SHIFT | Qt::Key_C, | |
| 395 | − false, | |
| 396 | − appInstance->getVoxels(), | |
| 397 | − SLOT(cullSharedFaces())); | |
| 398 | − | |
| 399 | − addCheckableActionToQMenuAndActionHash(renderDebugMenu, | |
| 400 | − MenuOption::ShowCulledSharedFaces, | |
| 401 | − 0, | |
| 402 | − false, | |
| 403 | − appInstance->getVoxels(), | |
| 404 | − SLOT(showCulledSharedFaces())); | |
| 405 | − | |
| 406 | 389 | QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools"); |
| 407 | 390 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction, |
| 408 | 391 | 0, |
| @@ -426,8 +409,11 @@ Menu::Menu() : · 17 unmodified lines | ||
| 426 | 409 | false, |
| 427 | 410 | appInstance->getAudio(), |
| 428 | 411 | SLOT(toggleToneInjection())); |
| 412 | + addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope, Qt::CTRL | Qt::Key_P, false, | |
| 413 | + appInstance->getAudio(), | |
| 414 | + SLOT(toggleScope())); | |
| 429 | 415 | addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScopePause, |
| 430 | − Qt::CTRL | Qt::Key_P, | |
| 416 | + Qt::CTRL | Qt::SHIFT | Qt::Key_P , | |
| 431 | 417 | false, |
| 432 | 418 | appInstance->getAudio(), |
| 433 | 419 | SLOT(toggleScopePause())); |
| @@ -916,7 +902,7 @@ void Menu::goToDomainDialog() { · 482 unmodified lines | ||
| 916 | 902 | } |
| 917 | 903 | |
| 918 | 904 | void Menu::goToOrientation(QString orientation) { |
| 919 | − LocationManager::getInstance().goToDestination(orientation); | |
| 905 | + LocationManager::getInstance().goToOrientation(orientation); | |
| 920 | 906 | } |
| 921 | 907 | |
| 922 | 908 | bool Menu::goToDestination(QString destination) { |
| @@ -997,9 +983,7 @@ void Menu::goToUser(const QString& user) { · 74 unmodified lines | ||
| 997 | 983 | /// Open a url, shortcutting any "hifi" scheme URLs to the local application. |
| 998 | 984 | void Menu::openUrl(const QUrl& url) { |
| 999 | 985 | if (url.scheme() == "hifi") { |
| 1000 | − QString path = url.toString(QUrl::RemoveScheme); | |
| 1001 | − path = path.remove(QRegExp("^:?/*")); | |
| 1002 | − goTo(path); | |
| 986 | + goToURL(url.toString()); | |
| 1003 | 987 | } else { |
| 1004 | 988 | QDesktopServices::openUrl(url); |
| 1005 | 989 | } |