History

merge with hifi/plugins

Sam Gondelman committed 11 years ago

Commit f69b7552 parents 8fbbb26 95000ee231 files · +6439 −5987Browse files

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

Unified · Split

interface/src/Menu.cpp+2−0
@@ -533,7 +533,9 @@ Menu::Menu() { · 532 unmodified lines
533 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::FrameTimer);533 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::FrameTimer);
534 addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, qApp, SLOT(runTests()));534 addActionToQMenuAndActionHash(timingMenu, MenuOption::RunTimingTests, 0, qApp, SLOT(runTests()));
535 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);535 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);
536 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::LogExtraTimings);
536 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);537 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);
538 addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::ShowRealtimeEntityStats);
537 539
538 auto audioIO = DependencyManager::get<AudioClient>();540 auto audioIO = DependencyManager::get<AudioClient>();
539 MenuWrapper* audioDebugMenu = developerMenu->addMenu("Audio");541 MenuWrapper* audioDebugMenu = developerMenu->addMenu("Audio");

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