History

Merge branch '19630' of github.com:huffman/hifi into 19630

Ryan Huffman committed 12 years ago

Commit 21819ce2 parents 7a3826b 186f77698 files · +3725 −933Browse files

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

Unified · Split

interface/src/Menu.cpp+6−22
@@ -285,9 +285,6 @@ Menu::Menu() : · 284 unmodified lines
285285 addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Bandwidth, 0, true);
286286 addActionToQMenuAndActionHash(viewMenu, MenuOption::BandwidthDetails, 0, this, SLOT(bandwidthDetails()));
287287 addActionToQMenuAndActionHash(viewMenu, MenuOption::OctreeStats, 0, this, SLOT(octreeStatsDetails()));
288− addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::AudioScope, 0, false,
289− appInstance->getAudio(),
290− SLOT(toggleScope()));
291288
292289 QMenu* developerMenu = addMenu("Developer");
293290
@@ -389,20 +386,6 @@ Menu::Menu() : · 95 unmodified lines
389386 addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::PipelineWarnings);
390387 addCheckableActionToQMenuAndActionHash(renderDebugMenu, MenuOption::SuppressShortTimings);
391388
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−
406389 QMenu* audioDebugMenu = developerMenu->addMenu("Audio Debugging Tools");
407390 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNoiseReduction,
408391 0,
@@ -426,8 +409,11 @@ Menu::Menu() : · 17 unmodified lines
426409 false,
427410 appInstance->getAudio(),
428411 SLOT(toggleToneInjection()));
412+ addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScope, Qt::CTRL | Qt::Key_P, false,
413+ appInstance->getAudio(),
414+ SLOT(toggleScope()));
429415 addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioScopePause,
430− Qt::CTRL | Qt::Key_P,
416+ Qt::CTRL | Qt::SHIFT | Qt::Key_P ,
431417 false,
432418 appInstance->getAudio(),
433419 SLOT(toggleScopePause()));
@@ -916,7 +902,7 @@ void Menu::goToDomainDialog() { · 482 unmodified lines
916902 }
917903
918904 void Menu::goToOrientation(QString orientation) {
919− LocationManager::getInstance().goToDestination(orientation);
905+ LocationManager::getInstance().goToOrientation(orientation);
920906 }
921907
922908 bool Menu::goToDestination(QString destination) {
@@ -997,9 +983,7 @@ void Menu::goToUser(const QString& user) { · 74 unmodified lines
997983 /// Open a url, shortcutting any "hifi" scheme URLs to the local application.
998984 void Menu::openUrl(const QUrl& url) {
999985 if (url.scheme() == "hifi") {
1000− QString path = url.toString(QUrl::RemoveScheme);
1001− path = path.remove(QRegExp("^:?/*"));
1002− goTo(path);
986+ goToURL(url.toString());
1003987 } else {
1004988 QDesktopServices::openUrl(url);
1005989 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t