History

Merge branch 'tablet-ui-edit-js' into 21197

David Rowe committed 9 years ago

Commit 9384dfd2 parents b592205 f05571125 files · +738 −204Browse files

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

Unified · Split

interface/src/Menu.cpp+3−3
@@ -578,7 +578,7 @@ Menu::Menu() { · 577 unmodified lines
578578 nodeList.data(), SLOT(toggleSendNewerDSConnectVersion(bool)));
579579 #endif
580580
581−
581+
582582 // Developer >> Tests >>>
583583 MenuWrapper* testMenu = developerMenu->addMenu("Tests");
584584 addActionToQMenuAndActionHash(testMenu, MenuOption::RunClientScriptTests, 0, dialogsManager.data(), SLOT(showTestingResults()));
@@ -629,9 +629,9 @@ Menu::Menu() { · 44 unmodified lines
629629
630630 auto scope = DependencyManager::get<AudioScope>();
631631 MenuWrapper* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
632− addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope, Qt::CTRL | Qt::Key_P, false,
632+ addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope, Qt::CTRL | Qt::Key_F2, false,
633633 scope.data(), SLOT(toggle()));
634− addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause, Qt::CTRL | Qt::SHIFT | Qt::Key_P, false,
634+ addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause, Qt::CTRL | Qt::SHIFT | Qt::Key_F2, false,
635635 scope.data(), SLOT(togglePause()));
636636
637637 addDisabledActionAndSeparator(audioScopeMenu, "Display Frames");

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